Modified: openejb/branches/openejb-3.2.x/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff ============================================================================== --- openejb/branches/openejb-3.2.x/pom.xml (original) +++ openejb/branches/openejb-3.2.x/pom.xml Sat Mar 19 20:30:23 2011 @@ -99,10 +99,12 @@ <!-- OSGi bundles properties --> <openejb.osgi.import.pkg>*</openejb.osgi.import.pkg> <openejb.osgi.private.pkg>!*</openejb.osgi.private.pkg> + <openejb.osgi.dynamic.import.pkg></openejb.osgi.dynamic.import.pkg> <openejb.osgi.export>${openejb.osgi.export.pkg}*;version=${openejb.osgi.export.version}</openejb.osgi.export> <openejb.osgi.export.pkg>org.apache.openejb</openejb.osgi.export.pkg> <openejb.osgi.export.version>${project.version}</openejb.osgi.export.version> <openejb.osgi.import>${openejb.osgi.import.pkg}</openejb.osgi.import> + <openejb.osgi.dynamic.import>${openejb.osgi.dynamic.import.pkg}</openejb.osgi.dynamic.import> <openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name> <!-- Used in assembly/openejb-tomcat* projects --> @@ -112,6 +114,14 @@ - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <org.apache.activemq.version>5.4.2</org.apache.activemq.version> + <quartz.version>1.8.4</quartz.version> + <org.springframework.version>3.0.4.RELEASE</org.springframework.version> + <junit.version>4.8.1</junit.version> + <org.apache.axis2.version>1.4.1</org.apache.axis2.version> + <org.apache.openwebbeans.version>1.1.0-SNAPSHOT</org.apache.openwebbeans.version> + <geronimo.connector.version>2.1</geronimo.connector.version> </properties> <build> @@ -153,8 +163,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> <plugin> @@ -276,7 +286,6 @@ </build> <modules> - <module>api</module> <module>itests</module> <module>container</module> <module>server</module> @@ -449,14 +458,14 @@ </profiles> <repositories> <repository> - <id>codehaus-snapshot</id> - <name>CodeHaus SNAPSHOT repository</name> - <url>http://snapshots.repository.codehaus.org</url> + <id>JBoss Repository</id> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> + <layout>default</layout> <releases> - <enabled>false</enabled> + <enabled>true</enabled> </releases> <snapshots> - <enabled>true</enabled> + <enabled>false</enabled> </snapshots> </repository> <repository> @@ -471,28 +480,6 @@ </snapshots> </repository> <repository> - <id>apache-incubating-repository</id> - <name>Apache Incubating Repository</name> - <url>http://people.apache.org/repo/m2-incubating-repository</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>tomcat-private-repository</id> - <name>Tomcat Private Repository</name> - <url>http://tomcat.apache.org/dev/dist/m2-repository</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> <id>openejb-3rdparty-builds</id> <name>3rd Party Build Repository</name> <url>http://svn.apache.org/repos/asf/openejb/repo/</url> @@ -504,11 +491,6 @@ <enabled>false</enabled> </snapshots> </repository> - <repository> - <id>java.net</id> - <url>http://download.java.net/maven/1</url> - <layout>legacy</layout> - </repository> </repositories> <pluginRepositories> <pluginRepository> @@ -548,7 +530,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -567,7 +549,7 @@ <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>1.8.0.7</version> + <version>1.8.0.10</version> </dependency> <dependency> <groupId>idb</groupId> @@ -577,29 +559,24 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.5</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> + <dependency> <groupId>com.agical.rmock</groupId> <artifactId>rmock</artifactId> - <version>2.0.0</version> + <version>2.0.2</version> <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.12</version> - </dependency> - <dependency> <groupId>org.apache.activemq</groupId> <artifactId>kahadb</artifactId> - <version>5.3.1</version> + <version>${org.apache.activemq.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-ra</artifactId> - <version>5.3.1</version> + <version>${org.apache.activemq.version}</version> <exclusions> <exclusion> <groupId>org.springframework</groupId> @@ -615,12 +592,20 @@ </exclusion> </exclusions> </dependency> - <dependency> + <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-core</artifactId> - <version>5.3.1</version> + <version>${org.apache.activemq.version}</version> <exclusions> <exclusion> + <artifactId>icu4j</artifactId> + <groupId>com.ibm.icu</groupId> + </exclusion> + <exclusion> + <artifactId>jasypt</artifactId> + <groupId>org.jasypt</groupId> + </exclusion> + <exclusion> <groupId>activesoap</groupId> <artifactId>jaxp-api</artifactId> </exclusion> @@ -696,12 +681,46 @@ <groupId>org.slf4j</groupId> <artifactId>nlog4j</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${org.springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${org.springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${org.springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${org.springframework.version}</version> + </dependency> + <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-connector</artifactId> - <version>2.1</version> + <version>${geronimo.connector.version}</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.specs</groupId> @@ -720,7 +739,7 @@ <dependency> <groupId>org.apache.geronimo.components</groupId> <artifactId>geronimo-transaction</artifactId> - <version>2.1</version> + <version>${geronimo.connector.version}</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.specs</groupId> @@ -759,91 +778,37 @@ <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>1.2.1</version> + <version>2.0.1</version> <exclusions> <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-jdbc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-jdbc-5</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-kernel</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-kernel-5</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-lib-5</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-lib</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-persistence-jdbc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-xmlstore</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.0.1B_spec</artifactId> + <artifactId>geronimo-jpa_2.0_spec</artifactId> </exclusion> <exclusion> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> + <artifactId>geronimo-jms_1.1_spec</artifactId> </exclusion> <exclusion> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jms_1.1_spec</artifactId> + <artifactId>geronimo-jta_1.1_spec</artifactId> </exclusion> <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_3.0_spec</artifactId> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> </exclusion> + + <!-- regarding maven rules, we don't need to exclude those deps + because we already depend on --> <exclusion> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </exclusion> <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> </exclusion> </exclusions> </dependency> - <!-- - Required for openjpa (their uber pom is messed) - --> - <dependency> - <groupId>net.sourceforge.serp</groupId> - <artifactId>serp</artifactId> - <version>1.13.1</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> - <!-- - end: Required for openjpa - --> <dependency> <groupId>com.sun.xml.bind</groupId> @@ -890,6 +855,11 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> + <artifactId>xbean-bundleutils</artifactId> + <version>${xbeanVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.xbean</groupId> <artifactId>xbean-spring</artifactId> <version>${xbeanVersion}</version> </dependency> @@ -907,7 +877,7 @@ <dependency> <groupId>org.codehaus.swizzle</groupId> <artifactId>swizzle-stream</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </dependency> <dependency> <groupId>org.apache.openejb</groupId> @@ -920,9 +890,14 @@ <version>1.4</version> </dependency> <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.1</version> + <groupId>org.apache.ws.security</groupId> + <artifactId>wss4j</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.6.2</version> </dependency> <dependency> <groupId>xmlunit</groupId> @@ -932,14 +907,250 @@ </dependency> <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> + <artifactId>tomcat-catalina</artifactId> <version>${tomcatVersion}</version> <optional>true</optional> </dependency> <dependency> - <groupId>quartz</groupId> - <artifactId>quartz</artifactId> - <version>1.5.2</version> + <groupId>org.quartz-scheduler</groupId> + <artifactId>quartz</artifactId> + <version>${quartz.version}</version> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>4.2.0</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>4.2.0</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.12.0.GA</version> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.3.04</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.neethi</groupId> + <artifactId>neethi</artifactId> + <version>2.0.4</version> + <exclusions> + <exclusion> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <artifactId>backport-util-concurrent</artifactId> + <groupId>backport-util-concurrent</groupId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-api</artifactId> + <version>1.2.9</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-impl</artifactId> + <version>1.2.9</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <artifactId>serp</artifactId> + <groupId>net.sourceforge.serp</groupId> + <version>1.13.1</version> + </dependency> + <dependency> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.1</version> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> + <dependency> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.2</version> + </dependency> + <dependency> + <groupId>regexp</groupId> + <artifactId>regexp</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.4</version> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-impl</artifactId> + <version>${org.apache.openwebbeans.version}</version> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-spi</artifactId> + <version>${org.apache.openwebbeans.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-el_2.2_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-interceptor_1.1_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-ejb</artifactId> + <version>${org.apache.openwebbeans.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-interceptor_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-ee</artifactId> + <version>${org.apache.openwebbeans.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-el_2.2_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_2.5_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-validation_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <artifactId>openwebbeans-ee-common</artifactId> + <groupId>org.apache.openwebbeans</groupId> + <version>${org.apache.openwebbeans.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_1.0_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.14</version> + <scope>test</scope> + </dependency> + <dependency> + <artifactId>commons-lang</artifactId> + <groupId>commons-lang</groupId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons.schema</groupId> + <artifactId>XmlSchema</artifactId> + <version>1.4.6</version> </dependency> </dependencies> </dependencyManagement>
Modified: openejb/branches/openejb-3.2.x/server/openejb-axis2/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-axis2/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff ============================================================================== --- openejb/branches/openejb-3.2.x/server/openejb-axis2/pom.xml (original) +++ openejb/branches/openejb-3.2.x/server/openejb-axis2/pom.xml Sat Mar 19 20:30:23 2011 @@ -35,100 +35,70 @@ <artifactId>openejb-webservices</artifactId> <version>${project.version}</version> </dependency> - - <!-- maven is dropping this dep for some strange reason, so include it explicitly --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-jaxws</artifactId> - <version>1.3</version> + <version>${org.apache.axis2.version}</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-java2wsdl</artifactId> - <version>1.3</version> + <version>${org.apache.axis2.version}</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-kernel</artifactId> - <version>1.3</version> + <version>${org.apache.axis2.version}</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-adb</artifactId> - <version>1.3</version> + <version>${org.apache.axis2.version}</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-metadata</artifactId> - <version>1.3</version> + <version>${org.apache.axis2.version}</version> </dependency> <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.5</version> </dependency> <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> </dependency> <dependency> <groupId>org.apache.ws.commons.schema</groupId> <artifactId>XmlSchema</artifactId> - <version>1.3.1</version> </dependency> <dependency> - <groupId>org.apache.neethi</groupId> - <artifactId>neethi</artifactId> - <version>2.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1-beta-10</version> + <groupId>org.apache.neethi</groupId> + <artifactId>neethi</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.4.0</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> </dependency> <dependency> Modified: openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/AxisServiceGenerator.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/AxisServiceGenerator.java?rev=1083280&r1=1083279&r2=1083280&view=diff ============================================================================== --- openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/AxisServiceGenerator.java (original) +++ openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/AxisServiceGenerator.java Sat Mar 19 20:30:23 2011 @@ -232,7 +232,8 @@ public class AxisServiceGenerator { this.def = def; } - public WsdlComposite generateWsdl(String implClass, String bindingType) throws WebServiceException { + public WsdlComposite generateWsdl(String implClass, EndpointDescription endpointDesc) + throws WebServiceException { // Need WSDL generation code WsdlComposite composite = new WsdlComposite(); composite.setWsdlFileName(implClass); Modified: openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/HandlerLifecycleManagerImpl.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/HandlerLifecycleManagerImpl.java?rev=1083280&r1=1083279&r2=1083280&view=diff ============================================================================== --- openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/HandlerLifecycleManagerImpl.java (original) +++ openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/HandlerLifecycleManagerImpl.java Sat Mar 19 20:30:23 2011 @@ -6,9 +6,9 @@ * 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 @@ -24,10 +24,16 @@ import org.apache.axis2.jaxws.injection. import org.apache.axis2.jaxws.lifecycle.LifecycleException; import javax.xml.ws.handler.Handler; +import org.apache.axis2.jaxws.description.ServiceDescription; +import org.apache.axis2.jaxws.lifecycle.BaseLifecycleManager; +import org.apache.axis2.jaxws.runtime.description.injection.ResourceInjectionServiceRuntimeDescription; +import org.apache.axis2.jaxws.runtime.description.injection.ResourceInjectionServiceRuntimeDescriptionFactory; -public class HandlerLifecycleManagerImpl implements HandlerLifecycleManager { +public class HandlerLifecycleManagerImpl extends BaseLifecycleManager implements HandlerLifecycleManager { + + @Override public Handler createHandlerInstance(MessageContext context, Class handlerClass) throws LifecycleException, ResourceInjectionException { - Handler instance = null; + instance = null; try { instance = (Handler) handlerClass.newInstance(); @@ -35,12 +41,22 @@ public class HandlerLifecycleManagerImpl throw new LifecycleException("Failed to create handler", e); } - return instance; + return (Handler) instance; } - public void invokePostConstruct() throws LifecycleException { - } + @Override + public void destroyHandlerInstance(MessageContext mc, Handler handler) throws LifecycleException, ResourceInjectionException { + this.instance = handler; + + ServiceDescription serviceDesc = mc.getEndpointDescription().getServiceDescription(); + ResourceInjectionServiceRuntimeDescription injectionDesc = null; + if (serviceDesc != null) { + injectionDesc = ResourceInjectionServiceRuntimeDescriptionFactory.get(serviceDesc, handler.getClass()); + } + + if (injectionDesc != null && injectionDesc.getPreDestroyMethod() != null) { + invokePreDestroy(injectionDesc.getPreDestroyMethod()); + } - public void invokePreDestroy() throws LifecycleException { } } Modified: openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/client/Axis2ClientConfigurationFactory.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/client/Axis2ClientConfigurationFactory.java?rev=1083280&r1=1083279&r2=1083280&view=diff ============================================================================== --- openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/client/Axis2ClientConfigurationFactory.java (original) +++ openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/client/Axis2ClientConfigurationFactory.java Sat Mar 19 20:30:23 2011 @@ -40,7 +40,7 @@ public class Axis2ClientConfigurationFac } public ConfigurationContext getClientConfigurationContext() { - ClassLoader cl = ClassLoaderUtils.getContextClassLoader(); + ClassLoader cl = ClassLoaderUtils.getContextClassLoader(null); if (cl == null) { if (this.reuseConfigurationContext) { cl = ClientConfigurationFactory.class.getClassLoader(); Modified: openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbInterceptor.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbInterceptor.java?rev=1083280&r1=1083279&r2=1083280&view=diff ============================================================================== --- openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbInterceptor.java (original) +++ openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/ejb/EjbInterceptor.java Sat Mar 19 20:30:23 2011 @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.openejb.server.axis2.ejb; import org.apache.axis2.AxisFault; @@ -24,7 +23,6 @@ import org.apache.axis2.context.Operatio import org.apache.axis2.description.AxisOperation; import org.apache.axis2.description.WSDL2Constants; import org.apache.axis2.engine.AxisEngine; -import org.apache.axis2.jaxws.core.InvocationContext; import org.apache.axis2.jaxws.core.InvocationContextFactory; import org.apache.axis2.jaxws.core.MessageContext; import org.apache.axis2.jaxws.message.util.MessageUtils; @@ -34,8 +32,10 @@ import org.apache.axis2.wsdl.WSDLConstan import javax.interceptor.AroundInvoke; import javax.xml.ws.Binding; +import org.apache.axis2.jaxws.server.EndpointInvocationContext; public class EjbInterceptor { + private MessageContext requestMsgCtx; public EjbInterceptor(MessageContext requestCtx) { @@ -50,7 +50,7 @@ public class EjbInterceptor { EjbEndpointController controller = new EjbEndpointController(invContext); Binding binding = (Binding) this.requestMsgCtx.getAxisMessageContext().getProperty(JAXWSMessageReceiver.PARAM_BINDING); - InvocationContext ic = InvocationContextFactory.createInvocationContext(binding); + EndpointInvocationContext ic = InvocationContextFactory.createEndpointInvocationContext(binding); ic.setRequestMessageContext(this.requestMsgCtx); controller.invoke(ic); @@ -60,8 +60,8 @@ public class EjbInterceptor { //If there is a fault it could be Robust In-Only if (!isMepInOnly(mep) || hasFault(responseMsgCtx)) { // If this is a two-way exchange, there should already be a - // JAX-WS MessageContext for the response. We need to pull - // the Message data out of there and set it on the Axis2 + // JAX-WS MessageContext for the response. We need to pull + // the Message data out of there and set it on the Axis2 // MessageContext. org.apache.axis2.context.MessageContext axisResponseMsgCtx = responseMsgCtx.getAxisMessageContext(); @@ -91,13 +91,12 @@ public class EjbInterceptor { } private boolean isMepInOnly(String mep) { - boolean inOnly = mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) || - mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY) || - mep.equals(WSDL2Constants.MEP_URI_IN_ONLY) || - mep.equals(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY) || - mep.equals(WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY) || - mep.equals(WSDL20_2006Constants.MEP_URI_IN_ONLY); + boolean inOnly = mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) + || mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY) + || mep.equals(WSDL2Constants.MEP_URI_IN_ONLY) + || mep.equals(WSDL2Constants.MEP_URI_ROBUST_IN_ONLY) + || mep.equals(WSDL20_2006Constants.MEP_URI_ROBUST_IN_ONLY) + || mep.equals(WSDL20_2006Constants.MEP_URI_IN_ONLY); return inOnly; } - } Modified: openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/pojo/PojoEndpointLifecycleManagerFactory.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/pojo/PojoEndpointLifecycleManagerFactory.java?rev=1083280&r1=1083279&r2=1083280&view=diff ============================================================================== --- openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/pojo/PojoEndpointLifecycleManagerFactory.java (original) +++ openejb/branches/openejb-3.2.x/server/openejb-axis2/src/main/java/org/apache/openejb/server/axis2/pojo/PojoEndpointLifecycleManagerFactory.java Sat Mar 19 20:30:23 2011 @@ -21,8 +21,9 @@ package org.apache.openejb.server.axis2. import org.apache.axis2.jaxws.server.endpoint.lifecycle.EndpointLifecycleException; import org.apache.axis2.jaxws.server.endpoint.lifecycle.EndpointLifecycleManager; import org.apache.axis2.jaxws.server.endpoint.lifecycle.factory.EndpointLifecycleManagerFactory; +import org.apache.axis2.jaxws.server.endpoint.lifecycle.impl.EndpointLifecycleManagerImpl; -public class PojoEndpointLifecycleManagerFactory extends EndpointLifecycleManagerFactory { +public class PojoEndpointLifecycleManagerFactory implements EndpointLifecycleManagerFactory { private EndpointLifecycleManager lifecycleManager; @@ -30,10 +31,16 @@ public class PojoEndpointLifecycleManage this.lifecycleManager = new PojoEndpointLifecycleManager(); } + @Override public EndpointLifecycleManager createEndpointLifecycleManager(Object endpointInstance) throws EndpointLifecycleException { - throw new UnsupportedOperationException(); + if (endpointInstance == null) { + throw new EndpointLifecycleException("PojoEndpointLifecycleManagerFactory.createEndpointLifecycleManager"); + } + return new EndpointLifecycleManagerImpl(endpointInstance); + } + @Override public EndpointLifecycleManager createEndpointLifecycleManager() { return this.lifecycleManager; } Modified: openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml?rev=1083280&r1=1083279&r2=1083280&view=diff ============================================================================== --- openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml (original) +++ openejb/branches/openejb-3.2.x/server/openejb-client/pom.xml Sat Mar 19 20:30:23 2011 @@ -73,11 +73,6 @@ <version>6.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.apache.openejb</groupId> - <artifactId>ejb31-api-experimental</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> <optional>true</optional>
