You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2007/10/08 18:58:29 UTC
svn commit: r582884 [3/3] - in /geronimo/server/trunk: ./ plugins/
plugins/activemq/ plugins/activemq/activemq-jetty/
plugins/activemq/activemq-portlets/ plugins/activemq/activemq-tomcat/
plugins/console/ plugins/console/console-base-portlets/ plugins/...
Copied: geronimo/server/trunk/plugins/pluto/pom.xml (from r582837, geronimo/plugins/pluto/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pom.xml?p2=geronimo/server/trunk/plugins/pluto/pom.xml&p1=geronimo/plugins/pluto/trunk/pom.xml&r1=582837&r2=582884&rev=582884&view=diff
==============================================================================
--- geronimo/plugins/pluto/trunk/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pom.xml Mon Oct 8 09:58:21 2007
@@ -23,53 +23,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>project-config</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>plugins</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.plugins</groupId>
<artifactId>pluto</artifactId>
- <name>Pluto</name>
+ <name>Geronimo Plugins :: Pluto</name>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
<description>
Pluto Portlet Container and Geronimo GBeans for Managing the Portal Driver
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/pluto/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/pluto/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/plugins/pluto/trunk</url>
- </scm>
-
- <properties>
- <!--
- NOTE: Project version, to be used instead of ${pom.version} since that
- value magically changes when using SNAPSHOT versions.
-
- This value *must* be kept in sync with the value of the <version>
- element, and it will need to be changed manually before a release,
- as the maven-release-plugin will not update this value.
- -->
- <version>1.0-SNAPSHOT</version>
- <castorVersion>1.1.1</castorVersion>
- <commonsBeanUtilsVersion>1.7.0</commonsBeanUtilsVersion>
- <commonsCollectionsVersion>3.1</commonsCollectionsVersion>
- <commonsDigesterVersion>1.8</commonsDigesterVersion>
- <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
- <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
- <junitVersion>3.8.2</junitVersion>
- <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
- <portletApiVersion>1.0</portletApiVersion>
- <springVersion>2.0.2</springVersion>
-
- <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
- <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
- </properties>
-
<dependencyManagement>
<dependencies>
@@ -174,12 +141,6 @@
</dependency>
<dependency>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- <version>${junitVersion}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-container</artifactId>
<version>${plutoVersion}</version>
@@ -192,30 +153,6 @@
</dependency>
<dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>${portletApiVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>${commonsDigesterVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commonsBeanUtilsVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>${commonsLoggingVersion}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-descriptor-impl</artifactId>
<version>${plutoVersion}</version>
@@ -227,300 +164,13 @@
<version>${plutoVersion}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jee-specs</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.castor</groupId>
- <artifactId>castor</artifactId>
- <version>${castorVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commonsCollectionsVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>4.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
- <version>2.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${springVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${springVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${springVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${springVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-upgrade</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>geronimo-console-core</artifactId>
- <version>${geronimoVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
</dependencyManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <version>${geronimoVersion}</version>
- <extensions>true</extensions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-2</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-4</version>
- </plugin>
-
- <!--
- FIXME: Should not configure war to assume jsp by default
- -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
- <archiveClasses>true</archiveClasses>
- <archive>
- <!-- Do not include META-INF/maven to avoid long file problems on windows -->
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
-
- <!--
- HACK: Include legal files explicity, otherwise they will end up in the wrong path
- or in another jar file in the war.
-
- NOTE: targetPath is broken for webResources (as documented)
- -->
- <webResources>
- <resource>
- <directory>${project.build.outputDirectory}</directory>
- <includes>
- <include>META-INF/LICENSE*</include>
- <include>META-INF/NOTICE*</include>
- <include>META-INF/DISCLAIMER*</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <version>${plutoVersion}</version>
- </plugin>
-
- </plugins>
-
- </pluginManagement>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
-
- <!-- Tools includes custom packagings, install as extension to pick them up -->
- <extensions>true</extensions>
-
- <executions>
- <execution>
- <id>install-legal-files</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-legal-files</goal>
- </goals>
- <configuration>
- <!-- Fail the build if no legal files were copied -->
- <strict>true</strict>
- </configuration>
- </execution>
-
- <execution>
- <id>verify-legal-files</id>
- <phase>verify</phase>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!-- Fail the build if no legal files were found -->
- <strict>true</strict>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/geronimo/sandbox/portals/tags</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <!--
- NOTE: The default repositories are picked up by Genesis, but need to
- specify where Genesis lives to pick it up any additional repositories.
- -->
-
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
-
- </repositories>
-
- <distributionManagement>
- <!--
- NOTE: The repository and snapshotRepository are picked up from Genesis.
- -->
-
- <site>
- <id>geronimo-website</id>
- <url>scp://people.apache.org/www/geronimo.apache.org/maven/pluto</url>
- </site>
- </distributionManagement>
-
- <profiles>
- <profile>
- <id>default</id>
-
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <modules>
- <module>geronimo-pluto</module>
- <module>pluto-support</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+ <module>geronimo-pluto</module>
+ <module>pluto-support</module>
+ </modules>
</project>
Copied: geronimo/server/trunk/plugins/pom.xml (from r581909, geronimo/server/trunk/configs/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?p2=geronimo/server/trunk/plugins/pom.xml&p1=geronimo/server/trunk/configs/pom.xml&r1=581909&r2=582884&rev=582884&view=diff
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Mon Oct 8 09:58:21 2007
@@ -29,9 +29,9 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
- <name>Geronimo Configs</name>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>plugins</artifactId>
+ <name>Geronimo Plugins</name>
<packaging>pom</packaging>
<properties>
@@ -52,27 +52,6 @@
<jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car</jpaDeployer>
-
- <!-- Common plan properties -->
- <PlanServerHostname>0.0.0.0</PlanServerHostname>
- <PlanRemoteDeployHostname>127.0.0.1</PlanRemoteDeployHostname>
- <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
- <PlanHTTPPort>8080</PlanHTTPPort>
- <PlanHTTPSPort>8443</PlanHTTPSPort>
- <PlanAJPPort>8019</PlanAJPPort>
- <PlanOpenEJBPort>4201</PlanOpenEJBPort>
- <PlanNamingPort>1099</PlanNamingPort>
- <PlanActiveMQPort>61616</PlanActiveMQPort>
- <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
- <PlanCOSNamingPort>1050</PlanCOSNamingPort>
- <PlanCOSSunNamingPort>1050</PlanCOSSunNamingPort>
- <PlanORBHost>localhost</PlanORBHost>
- <PlanORBPort>6882</PlanORBPort>
- <PlanORBSunPort>6882</PlanORBSunPort>
- <PlanORBSSLHost>localhost</PlanORBSSLHost>
- <PlanORBSSLPort>2001</PlanORBSSLPort>
- <PlanORBSunSSLPort>2001</PlanORBSunSSLPort>
- <PlanJMXPort>9999</PlanJMXPort>
</properties>
<build>
@@ -126,97 +105,12 @@
</build>
<modules>
- <module>geronimo-gbean-deployer-bootstrap</module>
- <module>activemq-ra</module>
- <module>activemq-broker</module>
- <module>axis</module>
- <module>axis-deployer</module>
- <module>client</module>
- <module>client-corba-yoko</module>
- <module>client-deployer</module>
- <module>client-security</module>
- <module>client-system</module>
- <module>client-transaction</module>
- <module>connector-deployer</module>
- <module>clustering</module>
- <module>xmlbeans</module>
- <module>geronimo-gbean-deployer</module>
- <module>hot-deployer</module>
- <module>jee-specs</module>
- <module>j2ee-corba-yoko</module>
- <module>j2ee-deployer</module>
- <module>j2ee-security</module>
- <module>server-security-config</module>
- <module>j2ee-server</module>
- <module>j2ee-system</module>
- <module>javamail</module>
- <module>jsp-examples-jetty</module>
- <module>jsp-examples-tomcat</module>
- <module>jsr88-cli</module>
- <module>jsr88-deploymentfactory</module>
- <module>jsr88-jar-configurer</module>
- <module>jsr88-rar-configurer</module>
- <module>jsr88-war-configurer</module>
- <module>jsr88-ear-configurer</module>
- <!--<module>ldap-demo-jetty</module>-->
- <!--<module>ldap-demo-tomcat</module>-->
- <!--<module>ldap-realm</module>-->
- <module>mejb</module>
- <module>offline-deployer</module>
- <module>online-deployer</module>
- <module>openejb</module>
- <module>openejb-corba-deployer</module>
- <module>openejb-deployer</module>
- <module>remote-deploy-jetty</module>
- <module>remote-deploy-tomcat</module>
- <module>rmi-naming</module>
- <module>servlet-examples-jetty</module>
- <module>servlet-examples-tomcat</module>
- <module>sharedlib</module>
- <module>shutdown</module>
+ <module>activemq</module>
+ <module>console</module>
+ <module>debugviews</module>
+ <module>plancreator</module>
+ <module>pluto</module>
<module>system-database</module>
- <module>tomcat6</module>
- <module>tomcat6-deployer</module>
- <module>uddi-tomcat</module>
- <module>unavailable-client-deployer</module>
- <module>unavailable-ejb-deployer</module>
- <module>unavailable-webservices-deployer</module>
- <module>upgrade</module>
- <module>upgrade-cli</module>
- <module>wadi-clustering</module>
- <module>webconsole-tomcat</module>
- <module>welcome-jetty</module>
- <module>welcome-tomcat</module>
- <module>dojo-tomcat</module>
- <module>ca-helper-jetty</module>
- <module>ca-helper-tomcat</module>
- <!-- jee5 configs -->
- <module>transformer-agent</module>
- <module>persistence-jpa10-deployer</module>
- <module>openjpa</module>
- <module>axis2</module>
- <module>axis2-ejb</module>
- <module>axis2-deployer</module>
- <module>axis2-ejb-deployer</module>
- <module>cxf</module>
- <module>cxf-ejb</module>
- <module>cxf-deployer</module>
- <module>cxf-ejb-deployer</module>
- <module>jaxws-deployer</module>
- <module>jaxws-ejb-deployer</module>
- <module>dojo-jetty6</module>
- <module>jetty6</module>
- <module>jetty6-clustering-builder-wadi</module>
- <module>jetty6-clustering-wadi</module>
- <module>jetty6-deployer</module>
- <module>myfaces</module>
- <module>myfaces-deployer</module>
- <module>transaction</module>
- <module>uddi-jetty6</module>
- <module>webconsole-jetty6</module>
- <module>webservices-common</module>
- <module>jasper</module>
- <module>jasper-deployer</module>
</modules>
</project>
Copied: geronimo/server/trunk/plugins/system-database/pom.xml (from r582837, geronimo/plugins/system-database/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?p2=geronimo/server/trunk/plugins/system-database/pom.xml&p1=geronimo/plugins/system-database/trunk/pom.xml&r1=582837&r2=582884&rev=582884&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/pom.xml Mon Oct 8 09:58:21 2007
@@ -23,384 +23,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>project-config</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>plugins</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <name>System Database</name>
+ <name>Geronimo Plugins :: System Database</name>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
<description>
- Geronimo System Database
+ Geronimo System Database Plugin
</description>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/system-database/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/system-database/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk</url>
- </scm>
-
- <properties>
- <!--
- NOTE: Project version, to be used instead of ${pom.version} since that
- value magically changes when using SNAPSHOT versions.
-
- This value *must* be kept in sync with the value of the <version>
- element, and it will need to be changed manually before a release,
- as the maven-release-plugin will not update this value.
- -->
- <version>1.0-SNAPSHOT</version>
- <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
- <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
- <consoleVersion>1.0-SNAPSHOT</consoleVersion>
- <derbyVersion>10.2.2.0</derbyVersion>
- <tranqlVersion>1.3</tranqlVersion>
-
- <!-- deployers needed to create the CAR files -->
- <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
- <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
- <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
- <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
- </properties>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <version>${tranqlVersion}</version>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <version>${tranqlVersion}</version>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-rar-configurer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>transaction</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-timer</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derbyVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derbyVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derbyVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
- <version>2.0.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-core</artifactId>
- <version>${consoleVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <version>${geronimoVersion}</version>
- <extensions>true</extensions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-2</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-4</version>
- </plugin>
-
- <!--
- FIXME: Should not configure war to assume jsp by default
- -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
- <archiveClasses>true</archiveClasses>
- <archive>
- <!-- Do not include META-INF/maven to avoid long file problems on windows -->
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
-
- <!--
- HACK: Include legal files explicity, otherwise they will end up in the wrong path
- or in another jar file in the war.
-
- NOTE: targetPath is broken for webResources (as documented)
- -->
- <webResources>
- <resource>
- <directory>${project.build.outputDirectory}</directory>
- <includes>
- <include>META-INF/LICENSE*</include>
- <include>META-INF/NOTICE*</include>
- <include>META-INF/DISCLAIMER*</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <version>${plutoVersion}</version>
- </plugin>
-
- </plugins>
-
- </pluginManagement>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
-
- <!-- Tools includes custom packagings, install as extension to pick them up -->
- <extensions>true</extensions>
-
- <executions>
- <execution>
- <id>install-legal-files</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-legal-files</goal>
- </goals>
- <configuration>
- <!-- Fail the build if no legal files were copied -->
- <strict>true</strict>
- </configuration>
- </execution>
-
- <execution>
- <id>verify-legal-files</id>
- <phase>verify</phase>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!-- Fail the build if no legal files were found -->
- <strict>true</strict>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/geronimo/sandbox/portals/tags</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <!--
- NOTE: The default repositories are picked up by Genesis, but need to
- specify where Genesis lives to pick it up any additional repositories.
- -->
-
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
-
- </repositories>
-
- <distributionManagement>
- <!--
- NOTE: The repository and snapshotRepository are picked up from Genesis.
- -->
-
- <site>
- <id>geronimo-website</id>
- <url>scp://people.apache.org/www/geronimo.apache.org/maven/portals</url>
- </site>
- </distributionManagement>
-
- <profiles>
- <profile>
- <id>default</id>
-
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <modules>
- <module>system-database-portlets</module>
- <module>system-database-tomcat</module>
- <module>system-database-jetty</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+ <module>system-database-portlets</module>
+ <module>system-database-tomcat</module>
+ <module>system-database-jetty</module>
+ </modules>
</project>
-
Modified: geronimo/server/trunk/plugins/system-database/system-database-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-jetty/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-jetty/pom.xml Mon Oct 8 09:58:21 2007
@@ -25,13 +25,12 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database-jetty</artifactId>
- <name>System Database :: Jetty plugin</name>
+ <name>Geronimo Plugins :: System Database - Jetty</name>
<packaging>car</packaging>
<dependencies>
@@ -47,52 +46,71 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>console-jetty</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jsr88-rar-configurer</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-derby</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-test-ddbean</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -107,6 +125,34 @@
<type>rar</type>
</dependency>
+ <dependency>
+ <groupId>org.directwebremoting</groupId>
+ <artifactId>dwr</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.directwebremoting</groupId>
+ <artifactId>dwr</artifactId>
+ </dependency>
+
+ <!-- for jspc. why is this needed? -->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
</dependencies>
<build>
@@ -136,9 +182,6 @@
</module>
<category>Databases</category>
<osiApproved>true</osiApproved>
- <geronimoVersions>
- <value>2.1-SNAPSHOT</value>
- </geronimoVersions>
<useMavenDependencies>
<value>true</value>
<includeVersion>true</includeVersion>
@@ -155,8 +198,6 @@
This version of the plugin works with the Geronimo/Jetty distribution.
</description>
</prerequisite>
- <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
- <source-repository>http://repo1.maven.org/maven2/</source-repository>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/pom.xml Mon Oct 8 09:58:21 2007
@@ -25,47 +25,72 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>system-database-portlets</artifactId>
- <name>System Database :: Admin Console Portlets</name>
+ <name>Geronimo Plugins :: System Database Portlets</name>
<packaging>war</packaging>
<dependencies>
+ <!-- for jspc maven plugin -->
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jee-specs</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- for jspc maven plugin -->
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-taglib</artifactId>
+ <version>${plutoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>console-core</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-converter</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-builder</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-derby</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
@@ -78,12 +103,26 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.directwebremoting</groupId>
<artifactId>dwr</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -96,6 +135,16 @@
<filtering>true</filtering>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo.jspc</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
</project>
Modified: geronimo/server/trunk/plugins/system-database/system-database-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-tomcat/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-tomcat/pom.xml Mon Oct 8 09:58:21 2007
@@ -25,13 +25,12 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database-tomcat</artifactId>
- <name>System Database :: Tomcat plugin</name>
+ <name>Geronimo Plugins :: System Database - Tomcat</name>
<packaging>car</packaging>
<dependencies>
@@ -47,52 +46,71 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>console-tomcat</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jsr88-rar-configurer</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-derby</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-test-ddbean</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -107,6 +125,21 @@
<type>rar</type>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.directwebremoting</groupId>
+ <artifactId>dwr</artifactId>
+ </dependency>
+
</dependencies>
<build>
@@ -134,11 +167,8 @@
<version>${version}</version>
<type>war</type>
</module>
- <category>Application</category>
+ <category>Databases</category>
<osiApproved>true</osiApproved>
- <geronimoVersions>
- <value>2.1-SNAPSHOT</value>
- </geronimoVersions>
<useMavenDependencies>
<value>true</value>
<includeVersion>true</includeVersion>
@@ -155,8 +185,6 @@
This version of the plugin works with the Geronimo/Tomcat distribution.
</description>
</prerequisite>
- <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
- <source-repository>http://repo1.maven.org/maven2/</source-repository>
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=582884&r1=582883&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Oct 8 09:58:21 2007
@@ -92,6 +92,7 @@
<axis2Version>1.3</axis2Version>
<axiomVersion>1.2.5</axiomVersion>
+ <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
</properties>
<dependencyManagement>
@@ -429,6 +430,12 @@
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-beansutils</groupId>
<artifactId>commons-beansutils</artifactId>
<version>1.7.0</version>
@@ -779,6 +786,12 @@
</dependency>
<dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
@@ -790,6 +803,12 @@
<version>1.1.3</version>
</dependency>
+ <dependency>
+ <groupId>org.directwebremoting</groupId>
+ <artifactId>dwr</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
@@ -1269,6 +1288,12 @@
<version>2.0.5</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+
<!--JSF 1.2 JARs from Apache MyFaces -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -1609,6 +1634,8 @@
</goals>
<configuration>
<warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</execution>
</executions>
@@ -1998,6 +2025,7 @@
<module>maven-plugins</module>
<module>applications</module>
<module>configs</module>
+ <module>plugins</module>
<module>assemblies</module>
</modules>
</profile>
@@ -2073,6 +2101,7 @@
<modules>
<module>applications</module>
<module>configs</module>
+ <module>plugins</module>
<module>assemblies</module>
</modules>
</profile>
@@ -2095,6 +2124,7 @@
<module>maven-plugins</module>
<module>applications</module>
<module>configs</module>
+ <module>plugins</module>
</modules>
</profile>