You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/05/15 14:58:36 UTC
svn commit: r1103361 - in /geronimo/server/trunk: ./ plugins/axis/
plugins/axis/axis/src/main/history/ plugins/uddi/ plugins/uddi/uddi-jetty/
plugins/uddi/uddi-jetty/src/main/history/ plugins/uddi/uddi-tomcat/
plugins/uddi/uddi-tomcat/src/main/history/...
Author: genspring
Date: Sun May 15 12:58:35 2011
New Revision: 1103361
URL: http://svn.apache.org/viewvc?rev=1103361&view=rev
Log:
Upgrade to scout bundle 1.2.2_2-SNAPSHOT
Modified:
geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis/pom.xml
geronimo/server/trunk/plugins/uddi/pom.xml
geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml
geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml
geronimo/server/trunk/plugins/uddi/uddi-war-repackage/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml Sun May 15 12:58:35 2011
@@ -12,11 +12,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>axis</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/pom.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/pom.xml Sun May 15 12:58:35 2011
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.juddi</groupId>
<artifactId>uddi-ws</artifactId>
- <version>3.0.5-SNAPSHOT</version>
+ <version>${juddiv3.version}</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
Modified: geronimo/server/trunk/plugins/uddi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/pom.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/pom.xml Sun May 15 12:58:35 2011
@@ -31,12 +31,10 @@
<description>
UDDI plugin
</description>
- <properties>
- <juddiv3.version>3.1.0-SNAPSHOT</juddiv3.version>
- </properties>
+
<modules>
<module>uddi-db</module>
- <module>uddi-war-repackage</module>
+ <module>uddi-war-repackage</module>
<module>uddi-jetty</module>
<module>uddi-tomcat</module>
</modules>
@@ -65,7 +63,13 @@
<type>war</type>
<scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <version>${juddiv3.version}</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml Sun May 15 12:58:35 2011
@@ -77,6 +77,7 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>uddi-war-repackage</artifactId>
<version>${project.version}</version>
+ <type>jar</type>
<scope>provided</scope>
</dependency>
@@ -100,39 +101,29 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxr_1.0_spec</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>scout</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>uddi-ws</artifactId>
- </dependency>
- <dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>commons-digester</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml Sun May 15 12:58:35 2011
@@ -7,16 +7,6 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>scout</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>cxf</artifactId>
<type>car</type>
@@ -37,11 +27,6 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>uddi-ws</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml Sun May 15 12:58:35 2011
@@ -84,6 +84,7 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>uddi-war-repackage</artifactId>
<version>${project.version}</version>
+ <type>jar</type>
<scope>provided</scope>
</dependency>
@@ -109,11 +110,13 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -125,17 +128,14 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>scout</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>uddi-ws</artifactId>
- </dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -161,6 +161,12 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml Sun May 15 12:58:35 2011
@@ -12,21 +12,11 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>scout</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis2</artifactId>
<type>car</type>
Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml Sun May 15 12:58:35 2011
@@ -20,15 +20,26 @@
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2">
+ <environment>
+ <import-package>org.apache.juddi.api_v3</import-package>
+ <import-package>org.apache.juddi.jaxb</import-package>
+ <import-package>org.apache.juddi.v3_service</import-package>
+ <import-package>org.uddi</import-package>
+ <import-package>org.uddi.api_v3</import-package>
+ <import-package>org.uddi.custody_v3</import-package>
+ <import-package>org.uddi.policy_v3</import-package>
+ <import-package>org.uddi.policy_v3_instanceparms</import-package>
+ <import-package>org.uddi.repl_v3</import-package>
+ <import-package>org.uddi.sub_v3</import-package>
+ <import-package>org.uddi.subr_v3</import-package>
+ <import-package>org.uddi.v3_service</import-package>
+ <import-package>org.uddi.vs_v3</import-package>
+ <import-package>org.uddi.vscache_v3</import-package>
+ <import-package>org.w3._2000._09.xmldsig_,org.w3c.dom</import-package>
+ </environment>
+
<context-root>/juddi</context-root>
- <!--<gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">-->
- <!-- copies uddi derby db files into specified location -->
- <!--<attribute name="prefix">META-INF/geronimo-uddi-db</attribute>-->
- <!--<attribute name="path">var/derby</attribute>-->
- <!--<reference name="ServerInfo">-->
- <!--<name>ServerInfo</name>-->
- <!--</reference>-->
- <!--</gbean>-->
+
<naming:resource-ref>
<naming:ref-name>jdbc/juddiDB</naming:ref-name>
<naming:resource-link>jdbc/juddiDB</naming:resource-link>
Modified: geronimo/server/trunk/plugins/uddi/uddi-war-repackage/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-war-repackage/pom.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-war-repackage/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-war-repackage/pom.xml Sun May 15 12:58:35 2011
@@ -29,10 +29,37 @@
<artifactId>uddi-war-repackage</artifactId>
<packaging>jar</packaging>
<name>Geronimo Plugins, UDDI :: uddi-war-repackage</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-naming</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <version>${juddiv3.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+
<build>
-
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -47,14 +74,14 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.juddi</groupId>
- <artifactId>juddiv3-war</artifactId>
- <type>war</type>
- <version>${juddiv3.version}</version>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddiv3-war</artifactId>
+ <type>war</type>
+ <version>${juddiv3.version}</version>
</artifactItem>
</artifactItems>
<includes>**/*</includes>
- <excludes>**/persistence.xml,**/juddi-client*.jar,**/juddi-core-openjpa*.jar,**/commons-beanutils*.jar,**/commons-collections*.jar,**/commons-digester*.jar,**/commons-lang*.jar,**/commons-logging-api*.jar</excludes>
+ <excludes>**/persistence.xml,**/juddi-client*.jar,**/juddi-core-openjpa*.jar,**/commons-beanutils*.jar,**/commons-collections*.jar,**/commons-digester*.jar,**/commons-lang*.jar,**/commons-logging-api*.jar,**/geronimo-jaxws_2.2_spec*.jar,**/uddi-ws*.jar</excludes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
@@ -69,10 +96,10 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.juddi</groupId>
- <artifactId>juddi-core-openjpa</artifactId>
- <type>jar</type>
- <version>${juddiv3.version}</version>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-core-openjpa</artifactId>
+ <type>jar</type>
+ <version>${juddiv3.version}</version>
</artifactItem>
</artifactItems>
<includes>**/*</includes>
@@ -82,10 +109,85 @@
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
+
+ <execution>
+ <id>unpack-v3services_in_uddi-ws</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <type>jar</type>
+ <version>${juddiv3.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <excludes>**/*.wsdl,**/*.xsd</excludes>
+ <outputDirectory>${project.build.directory}/classes/WEB-INF/classes</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ <!--execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.ws.scout</groupId>
+ <artifactId>scout</artifactId>
+ <version>1.2.2</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/classes/WEB-INF/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution-->
</executions>
</plugin>
-
-
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <!-- here the phase you need -->
+ <phase>compile</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes/WEB-INF/classes/org</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/classes/org</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/WEB-INF/**/**</include>
+ <include>**/META-INF/**/*</include>
+ <include>**/*.jsp</include>
+ <include>**/*.css</include>
+ </includes>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1103361&r1=1103360&r2=1103361&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sun May 15 12:58:35 2011
@@ -89,6 +89,7 @@
<woodstoxVersion>3.2.9_1</woodstoxVersion>
<sxcVersion>0.7.3_1</sxcVersion>
<yokoVersion>1.2-SNAPSHOT</yokoVersion>
+ <juddiv3.version>3.1.0-SNAPSHOT</juddiv3.version>
<!-- Deployers -->
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${project.version}/car
@@ -741,7 +742,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>scout</artifactId>
- <version>1.2.2_1</version>
+ <version>1.2.2_2-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>