You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2008/12/24 04:03:31 UTC
svn commit: r729203 - in /webservices/juddi/branches/v3_trunk:
juddi-core/pom.xml juddi-cxf/pom.xml
juddi-cxf/src/main/webapp/WEB-INF/beans.xml juddi-tomcat/build.xml
juddi-tomcat/pom.xml pom.xml uddi-ws/pom.xml
Author: tcunning
Date: Tue Dec 23 19:03:30 2008
New Revision: 729203
URL: http://svn.apache.org/viewvc?rev=729203&view=rev
Log:
JUDDI-167
Move the openjpa/hibernate profiles to the top level - multiple modules depend on them (juddi-core, juddi-cxf, juddi-tomcat)
Remove the top level dependencies so that the sub-module dependencies are explicit in their poms
Use cglib-nodeps so we don't depend on asm.jar
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
webservices/juddi/branches/v3_trunk/juddi-cxf/pom.xml
webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml
webservices/juddi/branches/v3_trunk/juddi-tomcat/pom.xml
webservices/juddi/branches/v3_trunk/pom.xml
webservices/juddi/branches/v3_trunk/uddi-ws/pom.xml
Modified: webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/pom.xml?rev=729203&r1=729202&r2=729203&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/pom.xml Tue Dec 23 19:03:30 2008
@@ -36,7 +36,6 @@
<layout>legacy</layout>
</pluginRepository>
</pluginRepositories>
-
<build>
<plugins>
<plugin>
@@ -64,6 +63,7 @@
<phase>generate-resources</phase>
<configuration>
<tasks>
+ <echo>PERSISTENCE = ${persistence}</echo>
<copy file="src/main/resources/version/Release.java.template"
tofile="src/main/java/org/apache/juddi/config/Release.java"
overwrite="true">
@@ -86,114 +86,68 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>uddi-ws</artifactId>
- <version>3.0.0.SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.1.2.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <version>3.0.0.SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>hibernate</id>
- <activation>
- <property>
- <name>persistence</name>
- <value>hibernate</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.3.1.ga</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>openjpa</id>
- <activation>
- <property>
- <name>persistence</name>
- <value>openjpa</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
-<build>
-<plugins>
-<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>JPA Enhance</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolProperties>
- <property>
- <name>addDefaultConstructor</name>
- <value>true</value>
- </property>
- <property>
- <name>enforcePropertyRestrictions</name>
- <value>true</value>
- </property>
- </toolProperties>
- </configuration>
-</plugin>
-</plugins>
-</build>
-</profile>
-</profiles>
</project>
Modified: webservices/juddi/branches/v3_trunk/juddi-cxf/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-cxf/pom.xml?rev=729203&r1=729202&r2=729203&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-cxf/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-cxf/pom.xml Tue Dec 23 19:03:30 2008
@@ -43,9 +43,20 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
</dependency>
</dependencies>
<build>
<finalName>juddi</finalName>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml?rev=729203&r1=729202&r2=729203&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-cxf/src/main/webapp/WEB-INF/beans.xml Tue Dec 23 19:03:30 2008
@@ -25,10 +25,16 @@
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<jaxws:endpoint id="inquiry" implementor="org.apache.juddi.api.impl.UDDIInquiryImpl" address="/inquiry"
- serviceName="a:InquiryService" endpointName="a:InquiryServicePort" xmlns:a="urn:uddi-org:api_v3_portType" />
+ serviceName="a:InquiryService" endpointName="a:InquiryServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
+ <jaxws:properties>
+ </jaxws:properties>
+ </jaxws:endpoint>
<jaxws:endpoint id="publish" implementor="org.apache.juddi.api.impl.UDDIPublicationImpl" address="/publish"
- serviceName="a:PublishService" endpointName="a:PublishServicePort" xmlns:a="urn:uddi-org:api_v3_portType" />
+ serviceName="a:PublishService" endpointName="a:PublishServicePort" xmlns:a="urn:uddi-org:api_v3_portType">
+ <jaxws:properties>
+ </jaxws:properties>
+ </jaxws:endpoint>
<jaxws:endpoint id="security" implementor="org.apache.juddi.api.impl.UDDISecurityImpl" address="/security"
serviceName="a:SecurityService" endpointName="a:SecurityServicePort" xmlns:a="urn:uddi-org:api_v3_portType" />
Modified: webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml?rev=729203&r1=729202&r2=729203&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-tomcat/build.xml Tue Dec 23 19:03:30 2008
@@ -8,12 +8,21 @@
<unzip dest="${basedir}/target/tomcat" src="${dependency.tomcat.zip}"/>
<copy file="${dependency.juddi.war}" tofile="${webapps.dir}/juddi.war"/>
+ <copy file="${basedir}/juddi.xml" tofile="${webapps.dir}"/>
<unzip dest="${webapps.dir}/juddi" src="${dependency.juddi.war}"/>
+ <chmod perm="ugo+x">
+ <fileset dir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin">
+ <include name="*.sh"/>
+ </fileset>
+ </chmod>
</target>
<target name="copy-resources" depends="unzip-tomcat">
+ <copy file="${dependency.mysql.jar}" todir="${common.lib.dir}"/>
+ <copy file="${dependency.log4j.jar}" todir="${common.lib.dir}"/>
<copy file="${dependency.derby.jar}" todir="${common.lib.dir}"/>
<copy file="${dependency.commons-discovery.jar}" todir="${common.lib.dir}"/>
+ <!--
<replace file="${webapps.dir}/juddi/WEB-INF/juddi.properties">
<replacetoken>juddi-sql/mysql</replacetoken>
<replacevalue>juddi-sql/derby</replacevalue>
@@ -26,6 +35,7 @@
<replacetoken>#juddi.jdbcDriver=com.mysql.jdbc.Driver</replacetoken>
<replacevalue>juddi.jdbcDriver=org.apache.derby.jdbc.EmbeddedDriver</replacevalue>
</replace>
+ -->
</target>
<target name="package-tomcat" depends="copy-resources">
Modified: webservices/juddi/branches/v3_trunk/juddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-tomcat/pom.xml?rev=729203&r1=729202&r2=729203&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-tomcat/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-tomcat/pom.xml Tue Dec 23 19:03:30 2008
@@ -40,6 +40,16 @@
<artifactId>derby</artifactId>
<version>10.1.2.1</version>
</dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -53,20 +63,22 @@
<configuration>
<tasks>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <property name="runtime_classpath" refid="maven.runtime.classpath"/>
- <property name="test_classpath" refid="maven.test.classpath"/>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
- <property name="project.version" value="${project.version}"/>
+ <property name="compile_classpath" refid="maven.compile.classpath"/>
+ <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+ <property name="test_classpath" refid="maven.test.classpath"/>
+ <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+ <property name="project.version" value="${project.version}"/>
- <property name="dependency.commons-discovery.jar" value="${maven.dependency.commons-discovery.commons-discovery.jar.path}"/>
- <property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}"/>
- <property name="dependency.tomcat.zip" value="${maven.dependency.tomcat.apache-tomcat.zip.path}"/>
- <property name="dependency.juddi.war" value="${maven.dependency.org.apache.juddi.juddi-cxf.war.path}"/>
- <property name="dependency.juddi.jar" value="${maven.dependency.org.apache.juddi.juddi.jar.path}"/>
- <ant antfile="${basedir}/build.xml">
+ <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}"/>
+ <property name="dependency.mysql.jar" value="${maven.dependency.mysql.mysql-connector-java.jar.path}"/>
+ <property name="dependency.commons-discovery.jar" value="${maven.dependency.commons-discovery.commons-discovery.jar.path}"/>
+ <property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}"/>
+ <property name="dependency.tomcat.zip" value="${maven.dependency.tomcat.apache-tomcat.zip.path}"/>
+ <property name="dependency.juddi.war" value="${maven.dependency.org.apache.juddi.juddi-cxf.war.path}"/>
+ <property name="dependency.juddi.jar" value="${maven.dependency.org.apache.juddi.juddi.jar.path}"/>
+ <ant antfile="${basedir}/build.xml">
<target name="package-tomcat"/>
- </ant>
+ </ant>
</tasks>
</configuration>
<goals>
Modified: webservices/juddi/branches/v3_trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/pom.xml?rev=729203&r1=729202&r2=729203&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/pom.xml Tue Dec 23 19:03:30 2008
@@ -127,66 +127,90 @@
</site>
</distributionManagement>
<dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.9</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1.4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.3.1.ga</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
-
-
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.5</version>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
</dependencies>
- <properties>
- <persistence>hibernate</persistence>
- </properties>
+ <profiles>
+ <profile>
+ <id>hibernate</id>
+ <activation>
+ <property>
+ <name>persistence</name>
+ <value>hibernate</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.5.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.3.1.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>openjpa</id>
+ <activation>
+ <property>
+ <name>persistence</name>
+ <value>openjpa</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ </dependencies>
+<build>
+<plugins>
+<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>JPA Enhance</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolProperties>
+ <property>
+ <name>addDefaultConstructor</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>enforcePropertyRestrictions</name>
+ <value>true</value>
+ </property>
+ </toolProperties>
+ </configuration>
+</plugin>
+</plugins>
+</build>
+</profile>
+</profiles>
</project>
Modified: webservices/juddi/branches/v3_trunk/uddi-ws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-ws/pom.xml?rev=729203&r1=729202&r2=729203&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-ws/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/uddi-ws/pom.xml Tue Dec 23 19:03:30 2008
@@ -94,16 +94,81 @@
<version>2.1.4</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.9</version>
- </dependency>
- <scope>test</scope>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.9</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.5.ga</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.3.1.ga</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org