Author: rr
Date: Tue Mar 9 15:03:29 2010
New Revision: 920910
URL: http://svn.apache.org/viewvc?rev=920910&view=rev
Log:
Split jbi-karaf into jbi-bundle
Added:
ode/branches/APACHE_ODE_1.X/jbi-bundle/
ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml (with props)
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/filtered-resources/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/filtered-resources/features.xml
(with props)
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/ode/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/ode/jbi/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java
(with props)
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/persistence.xml
(with props)
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/spring/
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml
(with props)
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml
(with props)
Removed:
ode/branches/APACHE_ODE_1.X/jbi-karaf/bnd.bnd
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/filtered-resources/
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/java/
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/META-INF/
Modified:
ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml
ode/branches/APACHE_ODE_1.X/pom.xml
Added: ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml?rev=920910&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml (added)
+++ ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml Tue Mar 9 15:03:29 2010
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jbi-bundle</artifactId>
+ <name>ODE :: JBI Bundle</name>
+ <packaging>bundle</packaging>
+ <modelVersion>4.0.0</modelVersion>
+
+ <properties>
+ <jbi.version>1.1.0</jbi.version>
+ </properties>
+
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>1.3.4-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+
<Export-Package>org.apache.ode*;version=${ode.version};-split-package:=merge-first</Export-Package>
+ <Import-Package>
+ !com.sun.mirror*,
+ !junit.framework*,
+ !org.apache.axis2.client*,
+ !org.apache.tools.ant*,
+ javax.jbi*;version="1.0",
+ javax.transaction*;version="1.1",
+ org.apache.commons.httpclient*;version="3.0",
+ org.apache.commons.logging*;version="1.1",
+ org.apache.commons*,
+ org.apache.geronimo.transaction.manager;version="2.0",
+ org.osgi.service.command;version="[0.2,1)",
+ org.springframework.beans.factory.xml;version="2.5",
+ org.apache.geronimo.transaction.manager,
+ org.tranql.connector.jdbc,
+ org.w3c.dom,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers,
+ org.jaxen.saxpath,
+ net.sf.saxon.xpath,
+ *;resolution:=optional
+ </Import-Package>
+<Embed-Dependency>*;inline=**.xsd|schemaorg_apache_xmlbeans/**|**.xml</Embed-Dependency>
+
+ <DynamicImport-Package>*</DynamicImport-Package>
+<Include-Resource>
+src/main/resources,
+...@../dao-jpa-ojpa-derby/target/ode-dao-jpa-ojpa-derby-${project.version}.zip,
+...@../dao-hibernate-db/target/ode-dao-hibernate-db-${project.version}.zip,
+</Include-Resource>
+
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jbi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-schemas</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-hibernate</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-jbi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <version>${jbi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: ode/branches/APACHE_ODE_1.X/jbi-bundle/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/filtered-resources/features.xml?rev=920910&view=auto
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/filtered-resources/features.xml
(added)
+++
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/filtered-resources/features.xml
Tue Mar 9 15:03:29 2010
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http///www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<features>
+
<repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
+ <feature name="ode" version="${ode.version}">
+ <feature version="${servicemix.nmr.version}">transaction</feature>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.specs.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.specs.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
+
<bundle>mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
+ <bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
+ <bundle>mvn:commons-lang/commons-lang/${commons.lang.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.bundle.version}</bundle>
+ <bundle>mvn:org.apache.derby/derby/${derby.version}</bundle>
+
<bundle>mvn:org.apache.ode/ode-jbi-karaf/${ode.version}/jar/bundle</bundle>
+ </feature>
+</features>
Propchange:
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/filtered-resources/features.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java?rev=920910&view=auto
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java
(added)
+++
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java
Tue Mar 9 15:03:29 2010
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ode.jbi.osgi;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+
+import javax.jbi.component.Component;
+import javax.jbi.component.ServiceUnitManager;
+
+import org.apache.commons.io.IOUtils;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * @author mproch
+ *
+ */
+public class ServiceUnitActivator implements BundleActivator {
+
+ File rootDir;
+ String generatedName;
+
+ public void start(BundleContext context) throws Exception {
+ generatedName = context.getBundle().getSymbolicName();
+ rootDir = context.getDataFile("bpelData");
+ rootDir.mkdirs();
+ Enumeration<?> en = context.getBundle().findEntries("/", "*", false);
+ while (en.hasMoreElements()) {
+ copyOne(rootDir, (URL) en.nextElement());
+ }
+ ServiceReference[] refs = context.getAllServiceReferences(
+ "javax.jbi.component.Component", "(&(NAME=OdeBpelEngine))");
+ if (refs == null || refs.length != 1) {
+ throw new RuntimeException("no appropriate service :(");
+ }
+ ServiceUnitManager suM = ((Component) context.getService(refs[0]))
+ .getServiceUnitManager();
+ ClassLoader l = Thread.currentThread().getContextClassLoader();
+ try {
+ ClassLoader suL = suM.getClass().getClassLoader();
+ Thread.currentThread().setContextClassLoader(new
BundleClassLoader(suL, context.getBundle()));
+ suM.deploy(generatedName, rootDir.getAbsolutePath());
+ suM.init(generatedName, rootDir.getAbsolutePath());
+ suM.start(generatedName);
+ } finally {
+ Thread.currentThread().setContextClassLoader(l);
+ }
+
+ }
+
+ private void copyOne(File dest, URL url) throws Exception {
+ File d = new File(dest, url.getPath());
+ InputStream str = url.openStream();
+ if (str != null) {
+ FileWriter wr = new FileWriter(d);
+ try {
+ IOUtils.copy(str, wr);
+ } finally {
+ wr.flush();
+ wr.close();
+ }
+ }
+ }
+
+ public void stop(BundleContext context) throws Exception {
+ ServiceReference[] refs = context.getAllServiceReferences(
+ "javax.jbi.component.Component", "(&(NAME=OdeBpelEngine))");
+ if (refs == null || refs.length != 1) {
+ throw new RuntimeException("no appropriate service :(");
+ }
+ ServiceUnitManager suM = ((Component) context.getService(refs[0]))
+ .getServiceUnitManager();
+ suM.shutDown(generatedName);
+ suM.undeploy(generatedName, rootDir.getAbsolutePath());
+
+ }
+
+ public class BundleClassLoader extends ClassLoader {
+ private final Bundle delegate;
+
+ public BundleClassLoader(ClassLoader parent, Bundle delegate) {
+ super(parent);
+ this.delegate = delegate;
+ }
+
+ @Override
+ public Class<?> loadClass(String name) throws ClassNotFoundException {
+ try {
+ return getParent().loadClass(name);
+ } catch (Exception e) {
+ return delegate.loadClass(name);
+ }
+ }
+ }
+
+}
Propchange:
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/java/org/apache/ode/jbi/osgi/ServiceUnitActivator.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/persistence.xml?rev=920910&view=auto
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/persistence.xml
(added)
+++
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/persistence.xml
Tue Mar 9 15:03:29 2010
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ version="1.0">
+ <persistence-unit name="ode-dao">
+ <!--
+ This properties file is used specifically by the
+ OpenJPA Enhancer.
+ -->
+
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrelationSetDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrelatorDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.EventDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.FaultDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageExchangeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.MessageRouteDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.PartnerLinkDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ProcessDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ProcessInstanceDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.ScopeDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.XmlDataDAOImpl</class>
+ <class>org.apache.ode.dao.jpa.CorrSetProperty</class>
+ <class>org.apache.ode.dao.jpa.MexProperty</class>
+ <class>org.apache.ode.dao.jpa.XmlDataProperty</class>
+ </persistence-unit>
+ <persistence-unit name="ode-store">
+ <!--
+ This properties file is used specifically by the
+ OpenJPA Enhancer.
+ -->
+
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <class>org.apache.ode.store.jpa.ProcessConfDaoImpl</class>
+ <class>org.apache.ode.store.jpa.ProcessConfPropertyDaoImpl</class>
+ <class>org.apache.ode.store.jpa.DeploymentUnitDaoImpl</class>
+ <class>org.apache.ode.store.jpa.VersionTrackerDAOImpl</class>
+ </persistence-unit>
+</persistence>
Propchange:
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml?rev=920910&view=auto
==============================================================================
---
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml
(added)
+++
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml
Tue Mar 9 15:03:29 2010
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:ctx="http://www.springframework.org/schema/context";
+ xmlns:osgi="http://www.springframework.org/schema/osgi";
+ xmlns:osgix="http://www.springframework.org/schema/osgi-compendium";
+ xmlns:util="http://www.springframework.org/schema/util";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context
+
http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util
+
http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/osgi
+
http://www.springframework.org/schema/osgi/spring-osgi.xsd
+ http://www.springframework.org/schema/osgi-compendium
+
http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd";>
+
+ <bean id="ode-config-properties"
class="org.apache.ode.jbi.OdeConfigProperties">
+ <constructor-arg ref="cmProps"/>
+ </bean>
+
+ <bean id="ode-component-lifecycle" class="org.apache.ode.jbi.OdeLifeCycle">
+ <constructor-arg ref="ode-config-properties"/>
+ </bean>
+
+ <bean id="ode-jbi-component" class="org.apache.ode.jbi.OdeComponent">
+ <constructor-arg ref="ode-component-lifecycle"/>
+ </bean>
+
+ <osgi:service ref="ode-jbi-component"
interface="javax.jbi.component.Component">
+ <osgi:service-properties>
+ <entry key="NAME" value="OdeBpelEngine" />
+ <entry key="TYPE" value="service-engine" />
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgix:cm-properties id="cmProps" persistent-id="org.apache.ode.jbi">
+ <prop key="ode-jbi.pidNamespace">urn:ode-jbi</prop>
+ <prop key="ode-jbi.allowIncompleteDeployment">false</prop>
+ <prop key="ode-jbi.db.mode">EMBEDDED</prop>
+ <prop key="ode-jbi.db.ext.dataSource">java:comp/env/jdbc/ode</prop>
+ <prop
key="ode-jbi.messageMapper">org.apache.ode.jbi.msgmap.ServiceMixMapper,org.apache.ode.jbi.msgmap.JbiWsdl11WrapperMapper</prop>
+ <prop key="ode-jbi.jca.port">0</prop>
+ </osgix:cm-properties>
+
+</beans>
Propchange:
ode/branches/APACHE_ODE_1.X/jbi-bundle/src/main/resources/META-INF/spring/ode-jbi.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml?rev=920910&r1=920909&r2=920910&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/jbi-karaf/pom.xml Tue Mar 9 15:03:29 2010
@@ -1,34 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-jbi-karaf</artifactId>
- <name>ODE :: JBI Karaf Bundle</name>
- <packaging>bundle</packaging>
- <modelVersion>4.0.0</modelVersion>
-
- <properties>
- <jbi.version>1.1.0</jbi.version>
- </properties>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ode</groupId>
@@ -36,102 +25,54 @@
<version>1.3.4-SNAPSHOT</version>
</parent>
- <build>
+ <artifactId>ode-jbi-karaf</artifactId>
+ <name>ODE :: JBI Karaf Features</name>
+ <packaging>jar</packaging>
+
+ <build>
<resources>
- <resource>
- <directory>src/main/filtered-resources</directory>
- <filtering>true</filtering>
- <targetPath>${project.build.directory}/features</targetPath>
- </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
-
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
-
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-
<Export-Package>org.apache.ode*;version=${ode.version};-split-package:=merge-first</Export-Package>
- <Import-Package>
- !com.sun.mirror*,
- !junit.framework*,
- !org.apache.axis2.client*,
- !org.apache.tools.ant*,
- javax.jbi*;version="1.0",
- javax.transaction*;version="1.1",
- org.apache.commons.httpclient*;version="3.0",
- org.apache.commons.logging*;version="1.1",
- org.apache.commons*,
- org.apache.geronimo.transaction.manager;version="2.0",
- org.osgi.service.command;version="[0.2,1)",
- org.springframework.beans.factory.xml;version="2.5",
- org.apache.geronimo.transaction.manager,
- org.tranql.connector.jdbc,
- org.w3c.dom,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers,
- org.jaxen.saxpath,
- net.sf.saxon.xpath,
- *;resolution:=optional
- </Import-Package>
-<Embed-Dependency>*;inline=**.xsd|schemaorg_apache_xmlbeans/**|**.xml</Embed-Dependency>
-
- <DynamicImport-Package>*</DynamicImport-Package>
-<Include-Resource>
-src/main/resources,
-...@../dao-jpa-ojpa-derby/target/ode-dao-jpa-ojpa-derby-${project.version}.zip,
-...@../dao-hibernate-db/target/ode-dao-hibernate-db-${project.version}.zip,
-</Include-Resource>
-
- </instructions>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-jbi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-bpel-schemas</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-hibernate</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-jpa</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-jbi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
- <version>${jbi.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- </dependencies>
</project>
Added: ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml?rev=920910&view=auto
==============================================================================
--- ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml
(added)
+++ ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml Tue
Mar 9 15:03:29 2010
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http///www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<features>
+
<repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
+ <feature name="ode" version="${ode.version}">
+ <feature version="${servicemix.nmr.version}">transaction</feature>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.specs.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.specs.version}</bundle>
+
<bundle>mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
+ <bundle>mvn:commons-pool/commons-pool/${commons.pool.version}</bundle>
+ <bundle>mvn:commons-lang/commons-lang/${commons.lang.version}</bundle>
+ <bundle>mvn:commons-beanutils/commons-beanutils/1.8.2</bundle>
+ <bundle>mvn:commons-io/commons-io/1.4</bundle>
+ <bundle>wrap:mvn:jaxen/jaxen/1.1.1</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/3.1_1</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/9.1.0.8_3</bundle>
+ <bundle>mvn:org.apache.ode/ode-jbi-bundle/${ode.version}</bundle>
+ </feature>
+ <feature name="ode-hib" version="${project.version}">
+ <bundle>wrap:mvn:org.tranql/tranql-connector/1.4</bundle>
+ <bundle>wrap:mvn:dom4j/dom4j/1.6.1</bundle>
+ <bundle>wrap:mvn:org.hibernate/hibernate/3.2.5.ga</bundle>
+ <feature version="${project.version}">ode</feature>
+ </feature>
+ <feature name="ode-jpa" version="${project.version}">
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.openjpa/1.2.1_2</bundle>
+ <feature version="${project.version}">ode</feature>
+ </feature>
+ <feature name="ode-derby" version="${project.version}">
+ <bundle>mvn:org.apache.derby/derby/${derby.version}</bundle>
+ </feature>
+ <feature name="ode-sqlserver" version="${project.version}">
+ <bundle>wrap:mvn:com.microsoft.sqlserver/sqljdbc/1.2</bundle>
+
<bundle>wrap:mvn:org.tranql/tranql-connector-sqlserver2005-common/1.1</bundle>
+ </feature>
+ <feature name="ode-oracle" version="${project.version}">
+ <bundle>wrap:mvn:oracle/ojdbc5/11.1.0.6.0</bundle>
+ <bundle>wrap:mvn:org.tranql/tranql-connector-oracle-common/1.4</bundle>
+ </feature>
+ <feature name="ode-jpa-derby" version="${project.version}">
+ <feature version="${project.version}">ode-derby</feature>
+ <feature version="${project.version}">ode-jpa</feature>
+ </feature>
+ <feature name="ode-hib-oracle" version="${project.version}">
+ <feature version="${project.version}">ode-oracle</feature>
+ <feature version="${project.version}">ode-hib</feature>
+ </feature>
+</features>
Propchange:
ode/branches/APACHE_ODE_1.X/jbi-karaf/src/main/resources/features.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ode/branches/APACHE_ODE_1.X/pom.xml
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/pom.xml?rev=920910&r1=920909&r2=920910&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/pom.xml (original)
+++ ode/branches/APACHE_ODE_1.X/pom.xml Tue Mar 9 15:03:29 2010
@@ -99,6 +99,7 @@
<xml.parser.version>2.6.2</xml.parser.version>
<activemq.version>4.1.1</activemq.version>
<xml-apis.version>1.3.04</xml-apis.version>
+ <servicemix.nmr.version>1.1.0-SNAPSHOT</servicemix.nmr.version>
</properties>
@@ -130,6 +131,7 @@
<module>bpel-test</module>
<module>axis2</module>
<module>jbi</module>
+ <module>jbi-bundle</module>
<module>jbi-karaf</module>
<module>axis2-war</module>
<module>distro</module>
