You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/05 23:58:52 UTC
svn commit: r419353 [3/6] - in /geronimo/sandbox/svkmerge/m2migration: ./
applications/ applications/console/ applications/console/console-core/
applications/console/console-ear/ applications/console/console-framework/
applications/console/console-stan...
Modified: geronimo/sandbox/svkmerge/m2migration/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/rmi-naming/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/rmi-naming/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/rmi-naming/pom.xml Wed Jul 5 14:58:47 2006
@@ -29,143 +29,154 @@
</parent>
<artifactId>rmi-naming</artifactId>
+ <name>Geronimo Configs :: RMI Naming</name>
<packaging>car</packaging>
- <name>RMI Naming configuration</name>
- <properties>
- <PlanServerHostname>localhost</PlanServerHostname>
- <PlanNamingPort>1099</PlanNamingPort>
- </properties>
-
- <build>
- <plugins>
- <!-- This plugin needed to support package type car -->
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
<dependencies>
+
<!-- parent config -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-system</artifactId>
- <!--<version>${geronimoVersion}</version>-->
+ <version>${pom.version}</version>
<type>car</type>
</dependency>
- <!-- June 7 2006 djencks. This is a copy of dependencies in project.xml -->
- <!-- only qname spec removed -->
- <!-- Individual Spec references -->
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.0_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
</dependency>
+
<!-- qname is in j2ee-system module-->
<!--dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-qname_1.1_spec</artifactId>
</dependency-->
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.1_spec</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
</dependency>
-
-
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-core</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<dependency>
<groupId>org.objectweb.howl</groupId>
<artifactId>howl</artifactId>
</dependency>
+
<!-- remote login -->
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
</dependency>
+
</dependencies>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-jetty/pom.xml Wed Jul 5 14:58:47 2006
@@ -27,35 +27,17 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>servlet-examples-jetty</artifactId>
+ <name>Geronimo Configs :: Servlet Examples for Jetty</name>
<packaging>car</packaging>
- <name>Servlet Examples for Jetty</name>
-
- <build>
- <plugins>
- <!-- This plugin needed to support package type car -->
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
- <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
+
<dependencies>
- <!-- to enforce build order -->
+
+ <!-- to enforce build order -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -66,5 +48,20 @@
<version>${tomcatVersion}</version>
<type>war</type>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-packaging-plugin</artifactId>
+ <configuration>
+ <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+ <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml Wed Jul 5 14:58:47 2006
@@ -27,35 +27,17 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>servlet-examples-tomcat</artifactId>
+ <name>Geronimo Configs :: Servlet Examples for Tomcat</name>
<packaging>car</packaging>
- <name>Servlet Examples for Tomcat</name>
-
- <build>
- <plugins>
- <!-- This plugin needed to support package type car -->
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
- <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
+
<dependencies>
- <!-- To enforce build order -->
+
+ <!-- To enforce build order -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat-deployer</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -66,5 +48,20 @@
<version>${tomcatVersion}</version>
<type>war</type>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-packaging-plugin</artifactId>
+ <configuration>
+ <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+ <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/sharedlib/pom.xml Wed Jul 5 14:58:47 2006
@@ -28,32 +28,19 @@
</parent>
<artifactId>sharedlib</artifactId>
+ <name>Geronimo Configs :: Shared Library</name>
<packaging>car</packaging>
- <name>Shared Library GBean</name>
-
- <build>
- <plugins>
- <!-- This plugin needed to support package type car -->
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
+
<dependencies>
+
<!-- parent config -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${pom.version}</version>
<type>car</type>
</dependency>
+
</dependencies>
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/shutdown/pom.xml Wed Jul 5 14:58:47 2006
@@ -28,23 +28,22 @@
</parent>
<artifactId>shutdown</artifactId>
+ <name>Geronimo Configs :: Shutdown</name>
<packaging>car</packaging>
- <name>Shutdown Configuration</name>
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
<!-- written to Manifest.mf -->
- <classPath>../lib/geronimo-deploy-tool-${geronimoVersion}.jar \
- ../lib/geronimo-common-${geronimoVersion}.jar \
- ../lib/geronimo-kernel-${geronimoVersion}.jar \
- ../lib/geronimo-system-${geronimoVersion}.jar \
- ../lib/geronimo-util-${geronimoVersion}.jar \
+ <classPath>../lib/geronimo-deploy-tool-${pom.version}.jar \
+ ../lib/geronimo-common-${pom.version}.jar \
+ ../lib/geronimo-kernel-${pom.version}.jar \
+ ../lib/geronimo-system-${pom.version}.jar \
+ ../lib/geronimo-util-${pom.version}.jar \
../lib/cglib-nodep-${cglibVersion}.jar \
../lib/commons-cli-${commonsCliVersion}.jar \
../lib/commons-logging-${commonsLoggingVersion}.jar \
Modified: geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/system-database/pom.xml Wed Jul 5 14:58:47 2006
@@ -27,57 +27,34 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
+ <name>Geronimo Configs :: System Database</name>
<packaging>car</packaging>
- <name>System Database Configuration for the J2EE Server</name>
-
- <properties>
- <PlanHTTPPort>8080</PlanHTTPPort>
- <PlanHTTPSPort>8443</PlanHTTPSPort>
- <PlanOpenEJBPort>4201</PlanOpenEJBPort>
- <PlanServerHostname>localhost</PlanServerHostname>
- <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
- <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
- </properties>
- <build>
- <plugins>
- <!-- This plugin needed to support package type car -->
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <deploymentConfig>${j2eeNowebServer}</deploymentConfig>
- <moduleFile>${settings.localRepository}/tranql/tranql-connector-derby-embed-xa/${tranqlVendorsVersion}/tranql-connector-derby-embed-xa-${tranqlVendorsVersion}.rar</moduleFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
<dependencies>
+
<!-- parent config -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
</dependency>
+
<!-- make sure all the deployers are available -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis-deployer</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-deployer</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -85,6 +62,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-deployer</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -92,11 +70,13 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-derby</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-timer</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
@@ -112,8 +92,22 @@
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql-connector-derby-embed-xa</artifactId>
- <version>${tranqlVendorsVersion}</version>
<type>rar</type>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-packaging-plugin</artifactId>
+ <configuration>
+ <deploymentConfig>${j2eeNowebServer}</deploymentConfig>
+ <moduleFile>${settings.localRepository}/tranql/tranql-connector-derby-embed-xa/${tranqlVendorsVersion}/tranql-connector-derby-embed-xa-${tranqlVendorsVersion}.rar</moduleFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/tomcat-deployer/pom.xml Wed Jul 5 14:58:47 2006
@@ -28,38 +28,24 @@
</parent>
<artifactId>tomcat-deployer</artifactId>
+ <name>Geronimo Configs :: Tomcat Deployer</name>
<packaging>car</packaging>
- <name>Tomcat Deployer Configuration for performing J2EE deployments</name>
- <build>
- <plugins>
- <plugin>
- <!-- uses geronimo-gbean-deployer -->
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
<dependencies>
+
<!-- parent -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
</dependency>
+
<!-- import classes -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
<scope>compile</scope>
</dependency>
@@ -67,6 +53,21 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat-builder</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-packaging-plugin</artifactId>
+ <configuration>
+ <deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/tomcat/pom.xml Wed Jul 5 14:58:47 2006
@@ -28,48 +28,31 @@
</parent>
<artifactId>tomcat</artifactId>
+ <name>Geronimo Configs :: Tomcat</name>
<packaging>car</packaging>
- <name>Tomcat Configuration for the J2EE Server</name>
- <properties>
- <PlanHTTPPort2>8090</PlanHTTPPort2>
- <PlanHTTPSPort2>8453</PlanHTTPSPort2>
- <PlanAJPPort2>8019</PlanAJPPort2>
- <PlanServerHostname>localhost</PlanServerHostname>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <!-- uses geronimo-gbean-deployer -->
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
<dependencies>
+
<!-- parent -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${pom.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat</artifactId>
+ <version>${pom.version}</version>
</dependency>
+
<!-- this should have come via g-tomcat
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
+ <version>${pom.version}</version>
</dependency> -->
+
</dependencies>
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-client-deployer/pom.xml Wed Jul 5 14:58:47 2006
@@ -28,33 +28,31 @@
</parent>
<artifactId>unavailable-client-deployer</artifactId>
+ <name>Geronimo Configs :: Unavailable Client Deployer</name>
<packaging>car</packaging>
- <name>Configuration for no j2ee app clients</name>
+
+ <dependencies>
+
+ <!-- parent config -->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
</configuration>
</plugin>
</plugins>
</build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
- <dependencies>
- <!-- parent config -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
- </dependencies>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-ejb-deployer/pom.xml Wed Jul 5 14:58:47 2006
@@ -28,33 +28,31 @@
</parent>
<artifactId>unavailable-ejb-deployer</artifactId>
+ <name>Geronimo Configs :: Unavailable EJB Deployer</name>
<packaging>car</packaging>
- <name>Configuration for no EJBs</name>
+
+ <dependencies>
+
+ <!-- parent config -->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
</configuration>
</plugin>
</plugins>
</build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
- <dependencies>
- <!-- parent config -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
- </dependencies>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/unavailable-webservices-deployer/pom.xml Wed Jul 5 14:58:47 2006
@@ -28,33 +28,31 @@
</parent>
<artifactId>unavailable-webservices-deployer</artifactId>
+ <name>Geronimo Configs :: Unavailable Web Services Deployer</name>
<packaging>car</packaging>
- <name>Unavailable Web Services deployer</name>
+
+ <dependencies>
+
+ <!-- parent config -->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <version>${pom.version}</version>
+ <type>car</type>
+ </dependency>
+
+ </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
<configuration>
<deploymentConfig>${gbeanDeployer},${j2eeDeployer}</deploymentConfig>
</configuration>
</plugin>
</plugins>
</build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
- <dependencies>
- <!-- parent config -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
- </dependencies>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/upgrade-cli/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/upgrade-cli/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/upgrade-cli/pom.xml Wed Jul 5 14:58:47 2006
@@ -27,32 +27,17 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>upgrade-cli</artifactId>
+ <name>Geronimo Configs :: CLI Upgrade</name>
<packaging>car</packaging>
- <name>System Configuration for the command line upgrade</name>
-
- <build>
- <plugins>
- <plugin>
- <!-- uses geronimo-gbean-deployer -->
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
+
<dependencies>
+
<!-- needed to enforce build order -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${pom.version}</version>
<type>car</type>
</dependency>
@@ -99,17 +84,18 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-qname_1.1_spec</artifactId>
-<!-- <scope>test</scope> -->
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-upgrade</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
@@ -121,5 +107,7 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</dependency>
+
</dependencies>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/upgrade/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/upgrade/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/upgrade/pom.xml Wed Jul 5 14:58:47 2006
@@ -27,43 +27,30 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>upgrade</artifactId>
+ <name>Geronimo Configs :: Plan Upgrade</name>
<packaging>car</packaging>
- <name>Geronimo Configuration for upgrading plans</name>
-
- <build>
- <plugins>
- <plugin>
- <!-- uses geronimo-gbean-deployer -->
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
+
<dependencies>
+
<!-- needed to enforce build order -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${pom.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-upgrade</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
@@ -75,5 +62,7 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</dependency>
+
</dependencies>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/welcome-jetty/pom.xml Wed Jul 5 14:58:47 2006
@@ -27,35 +27,17 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>welcome-jetty</artifactId>
+ <name>Geronimo Configs :: Welcome app Jetty</name>
<packaging>car</packaging>
- <name>Welcome app Jetty</name>
-
- <build>
- <plugins>
- <!-- This plugin needed to support package type car -->
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
- <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${geronimoVersion}/geronimo-welcome-${geronimoVersion}.war</moduleFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
+
<dependencies>
- <!-- to enforce build order -->
+
+ <!-- to enforce build order -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -63,8 +45,23 @@
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-welcome</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${pom.version}</version>
<type>war</type>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-packaging-plugin</artifactId>
+ <configuration>
+ <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
+ <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${pom.version}/geronimo-welcome-${pom.version}.war</moduleFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/welcome-tomcat/pom.xml Wed Jul 5 14:58:47 2006
@@ -27,44 +27,41 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>welcome-tomcat</artifactId>
+ <name>Geronimo Configs :: Welcome app Tomcat</name>
<packaging>car</packaging>
- <name>Welcome app Tomcat</name>
-
- <build>
- <plugins>
- <!-- This plugin needed to support package type car -->
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-packaging-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
- <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${geronimoVersion}/geronimo-welcome-${geronimoVersion}.war</moduleFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
-
+
<dependencies>
+
<!-- to enforce build order -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat-deployer</artifactId>
+ <version>${pom.version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-welcome</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${pom.version}</version>
<type>war</type>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-packaging-plugin</artifactId>
+ <configuration>
+ <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
+ <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${pom.version}/geronimo-welcome-${pom.version}.war</moduleFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/pom.xml Wed Jul 5 14:58:47 2006
@@ -17,7 +17,11 @@
<!-- $Rev$ $Date$ -->
-<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">
+<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>
@@ -28,111 +32,28 @@
</parent>
<artifactId>geronimo-packaging-plugin</artifactId>
+ <name>Geronimo Plugins :: Packaging</name>
<packaging>maven-plugin</packaging>
- <name>Geronimo :: Maven2 Packaging Plugin</name>
- <url>http://geronimo.apache.org</url>
-
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10220</url>
- </issueManagement>
-
- <ciManagement>
- <system>continuum</system>
- <notifiers>
- <notifier>
- <type>mail</type>
- <sendOnError />
- <sendOnFailure />
- <address>dev@geronimo.org</address>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <mailingLists>
- <mailingList>
- <name>Geronimo User List</name>
- <subscribe>users-subscribe@geronimo.apache.org</subscribe>
- <unsubscribe>users-unsubscribe@geronimo.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/geronimo-user/</archive>
- </mailingList>
-
- <mailingList>
- <name>Geronimo Developer List</name>
- <subscribe>dev-subscribe@geronimo.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@geronimo.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/geronimo-dev/</archive>
- </mailingList>
-
- <mailingList>
- <name>Source Control List</name>
- <subscribe>scm-subscribe@geronimo.apache.org</subscribe>
- <unsubscribe>scm-unsubscribe@geronimo.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/geronimo-scm/</archive>
- </mailingList>
- </mailingLists>
-
- <developers>
- <developer>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- </contributor>
- </contributors>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/</url>
- </scm>
-
- <organization>
- <name>Geronimo</name>
- <url>http://geronimo.apache.org/</url>
- </organization>
-
+
<dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0</version>
- </dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
+ <version>${pom.version}</version>
+
<!-- exclude transitive deps -->
<exclusions>
<exclusion>
@@ -145,10 +66,12 @@
</exclusion>
</exclusions>
</dependency>
-<!-- <dependency>
+
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </dependency> -->
+ </dependency>
+
<!-- for processing velocity -->
<dependency>
<groupId>xmlbeans</groupId>
@@ -170,49 +93,45 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>${commonsCliVersion}</version>
</dependency>
-<!--
+
+ <!--
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
- <version>${mx4jVersion}</version>
- </dependency> -->
+ </dependency>
+ -->
<!-- test -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-qname_1.1_spec</artifactId>
- <version>${geronimoSpecQnameVersion}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>${xercesVersion}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
- <version>${xmlParserApisVersion}</version>
</dependency>
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- <version>${xstreamVersion}</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- <version>${xpp3Version}</version>
</dependency>
</dependencies>
@@ -228,20 +147,6 @@
</plugin>
</plugins>
</build>
-
- <!--
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting> -->
+
</project>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java Wed Jul 5 14:58:47 2006
@@ -1,6 +1,5 @@
/**
- *
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,11 +25,16 @@
*
* @version $Rev$ $Date$
*/
-public abstract class AbstractDistributor {
+public abstract class AbstractDistributor
+{
private String user;
+
private String password;
+
private String url;
+
private File artifact;
+
protected ObjectName storeName;
public String getUser() {
@@ -42,7 +46,7 @@
*
* @param user the username
*/
- public void setUser(String user) {
+ public void setUser(final String user) {
this.user = user;
}
@@ -55,7 +59,7 @@
*
* @param password the password
*/
- public void setPassword(String password) {
+ public void setPassword(final String password) {
this.password = password;
}
@@ -68,7 +72,7 @@
*
* @param url the URL of the server
*/
- public void setUrl(String url) {
+ public void setUrl(final String url) {
this.url = url;
}
@@ -81,7 +85,7 @@
*
* @param artifact the artifact to distribute
*/
- public void setArtifact(File artifact) {
+ public void setArtifact(final File artifact) {
this.artifact = artifact;
}
@@ -96,10 +100,11 @@
*
* @param storeName the name of the ConfigurationStore to distribute to
*/
- public void setStoreName(String storeName) {
+ public void setStoreName(final String storeName) {
try {
this.storeName = new ObjectName(storeName);
- } catch (MalformedObjectNameException e) {
+ }
+ catch (MalformedObjectNameException e) {
throw new IllegalArgumentException("Invalid storeName: " + storeName);
}
}
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java Wed Jul 5 14:58:47 2006
@@ -1,36 +1,63 @@
-package org.apache.geronimo.plugin.packaging;
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
-import java.io.PrintStream;
+package org.apache.geronimo.plugin.packaging;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
-public abstract class AbstractPackagingMojo extends AbstractMojo {
- protected final String lineSep = "===========================================";
-
- private PrintStream logStream = System.out;
-
- private boolean failOnError = true;
-
- public abstract void execute() throws MojoExecutionException;
-
- protected void handleError(Exception e) throws MojoExecutionException {
- // seeLog();
- e.printStackTrace(logStream);
- logStream.println(lineSep);
- if (failOnError) {
- throw (MojoExecutionException) new MojoExecutionException(e
- .toString(), e);
- } else {
- try {
- throw (MojoFailureException) new MojoFailureException(e, e
- .toString(), e.getMessage());
- } catch (MojoFailureException e1) {
- e1.printStackTrace(logStream);
- logStream.println(lineSep);
- }
- }
- }
-
+/**
+ * ???
+ *
+ * @version $Id$
+ */
+public abstract class AbstractPackagingMojo
+ extends AbstractMojo
+{
+ protected Log log;
+
+ protected void init() {
+ log = getLog();
+ }
+
+ /**
+ * @throws MojoExecutionException
+ */
+ public void execute() throws MojoExecutionException, MojoFailureException {
+ init();
+
+ try {
+ doExecute();
+ }
+ catch (Exception e) {
+ if (e instanceof MojoExecutionException) {
+ throw (MojoExecutionException)e;
+ }
+ else if (e instanceof MojoFailureException) {
+ throw (MojoFailureException)e;
+ }
+ else {
+ throw new MojoExecutionException(e.getMessage(), e);
+ }
+ }
+ }
+
+ protected void doExecute() throws Exception {
+ // Sub-class should override
+ }
}
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java Wed Jul 5 14:58:47 2006
@@ -18,43 +18,46 @@
package org.apache.geronimo.plugin.packaging;
import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import java.util.List;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.config.ConfigurationStore;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
-import org.apache.geronimo.kernel.config.NoSuchConfigException;
import org.apache.geronimo.kernel.config.ConfigurationInfo;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.WritableListableRepository;
+//
+// TODO: Remove... appears unused
+//
+
/**
* Copies all the configurations out of source config store into target config store.
*
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class ConfigCopier {
- private static final Class[] REPO_ARGS = new Class[] {File.class};
- private static final Class[] STORE_ARGS = new Class[] {WritableListableRepository.class};
-
+ private static final Class[] REPO_ARGS = { File.class };
+ private static final Class[] STORE_ARGS = { WritableListableRepository.class };
private String sourceRepositoryClass;
+
private String targetRepositoryClass;
+
private String sourceConfigurationStoreClass;
+
private String targetConfigurationStoreClass;
+
private File sourceRepositoryLocation;
- private File targetRepositoryLocation;
+ private File targetRepositoryLocation;
public String getSourceRepositoryClass() {
return sourceRepositoryClass;
}
- public void setSourceRepositoryClass(String sourceRepositoryClass) {
+ public void setSourceRepositoryClass(final String sourceRepositoryClass) {
this.sourceRepositoryClass = sourceRepositoryClass;
}
@@ -62,7 +65,7 @@
return targetRepositoryClass;
}
- public void setTargetRepositoryClass(String targetRepositoryClass) {
+ public void setTargetRepositoryClass(final String targetRepositoryClass) {
this.targetRepositoryClass = targetRepositoryClass;
}
@@ -70,7 +73,7 @@
return sourceConfigurationStoreClass;
}
- public void setSourceConfigurationStoreClass(String sourceConfigurationStoreClass) {
+ public void setSourceConfigurationStoreClass(final String sourceConfigurationStoreClass) {
this.sourceConfigurationStoreClass = sourceConfigurationStoreClass;
}
@@ -78,7 +81,7 @@
return targetConfigurationStoreClass;
}
- public void setTargetConfigurationStoreClass(String targetConfigurationStoreClass) {
+ public void setTargetConfigurationStoreClass(final String targetConfigurationStoreClass) {
this.targetConfigurationStoreClass = targetConfigurationStoreClass;
}
@@ -86,7 +89,7 @@
return sourceRepositoryLocation;
}
- public void setSourceRepositoryLocation(File sourceRepositoryLocation) {
+ public void setSourceRepositoryLocation(final File sourceRepositoryLocation) {
this.sourceRepositoryLocation = sourceRepositoryLocation;
}
@@ -94,7 +97,7 @@
return targetRepositoryLocation;
}
- public void setTargetRepositoryLocation(File targetRepositoryLocation) {
+ public void setTargetRepositoryLocation(final File targetRepositoryLocation) {
this.targetRepositoryLocation = targetRepositoryLocation;
}
@@ -103,14 +106,20 @@
ClassLoader cl = this.getClass().getClassLoader();
Class sourceRepoClass = cl.loadClass(sourceRepositoryClass);
- WritableListableRepository sourceRepository = (WritableListableRepository) sourceRepoClass.getDeclaredConstructor(REPO_ARGS).newInstance(new Object[] {sourceRepositoryLocation});
+ WritableListableRepository sourceRepository = (WritableListableRepository)
+ sourceRepoClass.getDeclaredConstructor(REPO_ARGS).newInstance(new Object[]{sourceRepositoryLocation});
+
Class sourceConfigStoreClass = cl.loadClass(sourceConfigurationStoreClass);
- ConfigurationStore sourceConfigStore = (ConfigurationStore) sourceConfigStoreClass.getDeclaredConstructor(STORE_ARGS).newInstance(new Object[] {sourceRepository});
+ ConfigurationStore sourceConfigStore = (ConfigurationStore)
+ sourceConfigStoreClass.getDeclaredConstructor(STORE_ARGS).newInstance(new Object[]{sourceRepository});
Class targetRepoClass = cl.loadClass(targetRepositoryClass);
- WritableListableRepository targetRepository = (WritableListableRepository) targetRepoClass.getDeclaredConstructor(REPO_ARGS).newInstance(new Object[] {targetRepositoryLocation});
+ WritableListableRepository targetRepository = (WritableListableRepository)
+ targetRepoClass.getDeclaredConstructor(REPO_ARGS).newInstance(new Object[]{targetRepositoryLocation});
+
Class targetConfigStoreClass = cl.loadClass(targetConfigurationStoreClass);
- ConfigurationStore targetConfigStore = (ConfigurationStore) targetConfigStoreClass.getDeclaredConstructor(STORE_ARGS).newInstance(new Object[] {targetRepository});
+ ConfigurationStore targetConfigStore = (ConfigurationStore)
+ targetConfigStoreClass.getDeclaredConstructor(STORE_ARGS).newInstance(new Object[]{targetRepository});
List configs = sourceConfigStore.listConfigurations();
for (Iterator iterator = configs.iterator(); iterator.hasNext();) {
@@ -122,7 +131,8 @@
}
targetConfigStore.install(configData);
}
- } catch (Exception e) {
+ }
+ catch (Exception e) {
e.printStackTrace();
throw e;
}
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java Wed Jul 5 14:58:47 2006
@@ -18,143 +18,99 @@
package org.apache.geronimo.plugin.packaging;
import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import java.util.List;
import org.apache.geronimo.kernel.config.ConfigurationData;
import org.apache.geronimo.kernel.config.ConfigurationStore;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
-import org.apache.geronimo.kernel.config.NoSuchConfigException;
import org.apache.geronimo.kernel.config.ConfigurationInfo;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.WritableListableRepository;
+
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
+
+//
+// TODO: Rename to InstallMojo
+//
/**
* Copies all the configurations out of source config store into target config store.
*
* @goal install
- * @version $Rev:$ $Date:$
+ *
+ * @version $Rev$ $Date$
*/
public class ConfigCopierMojo extends AbstractPackagingMojo {
- private static final Class[] REPO_ARGS = new Class[] {File.class};
- private static final Class[] STORE_ARGS = new Class[] {WritableListableRepository.class};
+ private static final Class[] REPO_ARGS = { File.class };
+
+ private static final Class[] STORE_ARGS = { WritableListableRepository.class };
/**
* @parameter expression="org.apache.geronimo.system.repository.Maven2Repository"
*/
private String sourceRepositoryClass;
+
/**
* @parameter expression="org.apache.geronimo.system.repository.Maven2Repository"
*/
private String targetRepositoryClass;
+
/**
* @parameter expression="org.apache.geronimo.system.configuration.RepositoryConfigurationStore"
- */
+ */
private String sourceConfigurationStoreClass;
+
/**
* @parameter expression="org.apache.geronimo.plugin.packaging.MavenConfigStore"
- */
+ */
private String targetConfigurationStoreClass;
+
/**
* @parameter expression="${project.build.directory}/repository"
- */
+ */
private File sourceRepositoryLocation;
+
/**
* @parameter expression="${settings.LocalRepository}"
- */
+ */
private File targetRepositoryLocation;
+ protected void doExecute() throws Exception {
+ // copy artifact(s) to maven repository
+
+ ClassLoader cl = this.getClass().getClassLoader();
+
+ Class sourceRepoClass = cl.loadClass(sourceRepositoryClass);
+ WritableListableRepository sourceRepository = (WritableListableRepository)
+ sourceRepoClass.getDeclaredConstructor(REPO_ARGS).newInstance(new Object[]{ sourceRepositoryLocation });
+
+ Class sourceConfigStoreClass = cl.loadClass(sourceConfigurationStoreClass);
+ ConfigurationStore sourceConfigStore = (ConfigurationStore)
+ sourceConfigStoreClass.getDeclaredConstructor(STORE_ARGS).newInstance(new Object[]{ sourceRepository });
-/* public String getSourceRepositoryClass() {
- return sourceRepositoryClass;
- }
-
- public void setSourceRepositoryClass(String sourceRepositoryClass) {
- this.sourceRepositoryClass = sourceRepositoryClass;
- }
-
- public String getTargetRepositoryClass() {
- return targetRepositoryClass;
- }
-
- public void setTargetRepositoryClass(String targetRepositoryClass) {
- this.targetRepositoryClass = targetRepositoryClass;
- }
-
- public String getSourceConfigurationStoreClass() {
- return sourceConfigurationStoreClass;
- }
-
- public void setSourceConfigurationStoreClass(String sourceConfigurationStoreClass) {
- this.sourceConfigurationStoreClass = sourceConfigurationStoreClass;
- }
-
- public String getTargetConfigurationStoreClass() {
- return targetConfigurationStoreClass;
- }
-
- public void setTargetConfigurationStoreClass(String targetConfigurationStoreClass) {
- this.targetConfigurationStoreClass = targetConfigurationStoreClass;
- }
-
- public File getSourceRepositoryLocation() {
- return sourceRepositoryLocation;
- }
-
- public void setSourceRepositoryLocation(File sourceRepositoryLocation) {
- this.sourceRepositoryLocation = sourceRepositoryLocation;
- }
-
- public File getTargetRepositoryLocation() {
- return targetRepositoryLocation;
- }
-
- public void setTargetRepositoryLocation(File targetRepositoryLocation) {
- this.targetRepositoryLocation = targetRepositoryLocation;
- }*/
- public void execute() throws MojoExecutionException {
- try {
- // copy artifact(s) to maven repository
- System.out.println("----Begin installing config to local repository");
- executeCopyConfig();
- System.out.println("----Begin installing config to local repository");
- } catch (Exception e) {
- handleError(e);
- }
- }
-
- private void executeCopyConfig() throws Exception {
- try {
- ClassLoader cl = this.getClass().getClassLoader();
-
- Class sourceRepoClass = cl.loadClass(sourceRepositoryClass);
- WritableListableRepository sourceRepository = (WritableListableRepository) sourceRepoClass.getDeclaredConstructor(REPO_ARGS).newInstance(new Object[] {sourceRepositoryLocation});
- Class sourceConfigStoreClass = cl.loadClass(sourceConfigurationStoreClass);
- ConfigurationStore sourceConfigStore = (ConfigurationStore) sourceConfigStoreClass.getDeclaredConstructor(STORE_ARGS).newInstance(new Object[] {sourceRepository});
-
- Class targetRepoClass = cl.loadClass(targetRepositoryClass);
- WritableListableRepository targetRepository = (WritableListableRepository) targetRepoClass.getDeclaredConstructor(REPO_ARGS).newInstance(new Object[] {targetRepositoryLocation});
- Class targetConfigStoreClass = cl.loadClass(targetConfigurationStoreClass);
- ConfigurationStore targetConfigStore = (ConfigurationStore) targetConfigStoreClass.getDeclaredConstructor(STORE_ARGS).newInstance(new Object[] {targetRepository});
-
- List configs = sourceConfigStore.listConfigurations();
- for (Iterator iterator = configs.iterator(); iterator.hasNext();) {
- ConfigurationInfo configInfo = (ConfigurationInfo) iterator.next();
- Artifact configId = configInfo.getConfigID();
- System.out.println("*****[ConfigCopy] copying Artifact " + configId);
- ConfigurationData configData = sourceConfigStore.loadConfiguration(configId);
- if (targetConfigStore.containsConfiguration(configId)) {
- targetConfigStore.uninstall(configId);
- }
- targetConfigStore.install(configData);
+ Class targetRepoClass = cl.loadClass(targetRepositoryClass);
+ WritableListableRepository targetRepository = (WritableListableRepository)
+ targetRepoClass.getDeclaredConstructor(REPO_ARGS).newInstance(new Object[]{ targetRepositoryLocation });
+ Class targetConfigStoreClass = cl.loadClass(targetConfigurationStoreClass);
+
+ ConfigurationStore targetConfigStore = (ConfigurationStore)
+ targetConfigStoreClass.getDeclaredConstructor(STORE_ARGS).newInstance(new Object[]{ targetRepository });
+
+ Iterator iterator = sourceConfigStore.listConfigurations().iterator();
+ while (iterator.hasNext()) {
+ ConfigurationInfo configInfo = (ConfigurationInfo) iterator.next();
+ Artifact configId = configInfo.getConfigID();
+ ConfigurationData configData = sourceConfigStore.loadConfiguration(configId);
+
+ log.info("Copying artifact: " + configId);
+
+ if (targetConfigStore.containsConfiguration(configId)) {
+ targetConfigStore.uninstall(configId);
}
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
+
+ targetConfigStore.install(configData);
}
}
}
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java Wed Jul 5 14:58:47 2006
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.geronimo.plugin.packaging;
import org.apache.geronimo.gbean.GAttributeInfo;
@@ -34,7 +35,9 @@
/**
* @version $Rev$ $Date$
*/
-public class MavenAttributeStore implements ManageableAttributeStore {
+public class MavenAttributeStore
+ implements ManageableAttributeStore
+{
public MavenAttributeStore() {
}
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java Wed Jul 5 14:58:47 2006
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.geronimo.plugin.packaging;
import java.io.File;
@@ -38,7 +39,9 @@
*
* @version $Rev$ $Date$
*/
-public class MavenConfigStore extends RepositoryConfigurationStore {
+public class MavenConfigStore
+ extends RepositoryConfigurationStore
+{
public MavenConfigStore(Kernel kernel, String objectName, WritableListableRepository repository) {
super(kernel, objectName, repository);
}
@@ -59,7 +62,8 @@
File metaInf = new File(tmpFile, "META-INF");
metaInf.mkdirs();
return tmpFile;
- } catch (IOException e) {
+ }
+ catch (IOException e) {
// doh why can't I throw this?
return null;
}
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java Wed Jul 5 14:58:47 2006
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.geronimo.plugin.packaging;
import java.io.File;
@@ -51,8 +52,8 @@
*
* @version $Rev:385659 $ $Date$
*/
-public class PackageBuilder {
-
+public class PackageBuilder
+{
private static Log log = LogFactory.getLog(PackageBuilder.class);
private static final String KERNEL_NAME = "geronimo.maven";
@@ -66,19 +67,19 @@
private static AbstractName targetRepositoryAName;
private static final String[] ARG_TYPES = {
- boolean.class.getName(),
- File.class.getName(),
- File.class.getName(),
- File.class.getName(),
- Boolean.TYPE.getName(),
- String.class.getName(),
- String.class.getName(),
- String.class.getName(),
- String.class.getName(),
- String.class.getName(),
- String.class.getName(),
- String.class.getName(),
- String.class.getName(),
+ boolean.class.getName(),
+ File.class.getName(),
+ File.class.getName(),
+ File.class.getName(),
+ Boolean.TYPE.getName(),
+ String.class.getName(),
+ String.class.getName(),
+ String.class.getName(),
+ String.class.getName(),
+ String.class.getName(),
+ String.class.getName(),
+ String.class.getName(),
+ String.class.getName(),
};
private String repositoryClass;
@@ -89,7 +90,6 @@
private File repository;
private File targetRepository;
private Collection deploymentConfigs;
-// private Artifact[] deploymentConfig;
private AbstractName deployerName;
private File planFile;
@@ -124,7 +124,6 @@
this.configurationStoreClass = configurationStoreClass;
}
-
public File getRepository() {
return repository;
}
@@ -236,7 +235,7 @@
*
* @param mainClass
*/
- public void setMainClass(String mainClass) {
+ public void setMainClass(final String mainClass) {
this.mainClass = mainClass;
}
@@ -244,7 +243,7 @@
return mainGBean;
}
- public void setMainGBean(String mainGBean) {
+ public void setMainGBean(final String mainGBean) {
this.mainGBean = mainGBean;
}
@@ -252,7 +251,7 @@
return mainMethod;
}
- public void setMainMethod(String mainMethod) {
+ public void setMainMethod(final String mainMethod) {
this.mainMethod = mainMethod;
}
@@ -260,7 +259,7 @@
return configurations;
}
- public void setConfigurations(String configurations) {
+ public void setConfigurations(final String configurations) {
this.configurations = configurations;
}
@@ -268,7 +267,7 @@
return classPath;
}
- public void setClassPath(String classPath) {
+ public void setClassPath(final String classPath) {
this.classPath = classPath;
}
@@ -276,7 +275,7 @@
return endorsedDirs;
}
- public void setEndorsedDirs(String endorsedDirs) {
+ public void setEndorsedDirs(final String endorsedDirs) {
this.endorsedDirs = endorsedDirs;
}
@@ -284,7 +283,7 @@
return extensionDirs;
}
- public void setExtensionDirs(String extensionDirs) {
+ public void setExtensionDirs(final String extensionDirs) {
this.extensionDirs = extensionDirs;
}
@@ -292,7 +291,7 @@
return explicitResolutionLocation;
}
- public void setExplicitResolutionLocation(String explicitResolutionLocation) {
+ public void setExplicitResolutionLocation(final String explicitResolutionLocation) {
this.explicitResolutionLocation = explicitResolutionLocation;
}
@@ -308,9 +307,10 @@
System.out.println();
System.out.println(" Packaging configuration " + planFile);
System.out.println();
+
try {
Kernel kernel = createKernel();
- if(!targetSet) {
+ if (!targetSet) {
setTargetConfigStore();
}
@@ -331,8 +331,10 @@
AbstractName deployer = locateDeployer(kernel);
invokeDeployer(kernel, deployer, targetConfigStoreAName.toString());
+
System.out.println("Generated package " + packageFile);
- } catch (Exception e) {
+ }
+ catch (Exception e) {
log.error(e.getClass().getName() + ": " + e.getMessage(), e);
throw e;
}
@@ -343,11 +345,12 @@
kernel.stopGBean(targetRepositoryAName);
kernel.setAttribute(targetRepositoryAName, "root", targetRepository.toURI());
kernel.startGBean(targetRepositoryAName);
- if(kernel.getGBeanState(targetConfigStoreAName) != State.RUNNING_INDEX) {
+ if (kernel.getGBeanState(targetConfigStoreAName) != State.RUNNING_INDEX) {
throw new IllegalStateException("After restarted repository then config store is not running");
}
targetSet = true;
- } catch (Exception e) {
+ }
+ catch (Exception e) {
e.printStackTrace();
throw e;
}
@@ -384,6 +387,7 @@
/**
* Boot the in-Maven deployment system.
+ *
* This contains Repository and ConfigurationStore GBeans that map to
* the local maven installation.
*/
@@ -445,7 +449,6 @@
configManagerGBean.setReferencePatterns("Repositories", repoPatterns);
ConfigurationUtil.loadBootstrapConfiguration(kernel, bootstrap, cl);
-
}
/**
@@ -460,16 +463,34 @@
if (!i.hasNext()) {
throw new IllegalStateException("No deployer found matching deployerName: " + deployerName);
}
+
AbstractName deployer = (AbstractName) i.next();
if (i.hasNext()) {
throw new IllegalStateException("Multiple deployers found matching deployerName: " + deployerName);
}
+
return deployer;
}
private List invokeDeployer(Kernel kernel, AbstractName deployer, String targetConfigStore) throws Exception {
boolean isExecutable = mainClass != null;
- Object[] args = {Boolean.FALSE, planFile, moduleFile, singleArtifact ? packageFile : null, Boolean.valueOf(!isExecutable), mainClass, mainGBean, mainMethod, configurations, classPath, endorsedDirs, extensionDirs, targetConfigStore};
+
+ Object[] args = {
+ Boolean.FALSE,
+ planFile,
+ moduleFile,
+ singleArtifact ? packageFile : null,
+ Boolean.valueOf(!isExecutable),
+ mainClass,
+ mainGBean,
+ mainMethod,
+ configurations,
+ classPath,
+ endorsedDirs,
+ extensionDirs,
+ targetConfigStore
+ };
+
return (List) kernel.invoke(deployer, "deploy", args, ARG_TYPES);
}
}