Author: andygumbrecht
Date: Thu Sep 16 21:47:01 2010
New Revision: 997930
URL: http://svn.apache.org/viewvc?rev=997930&view=rev
Log:
Added http://mirrors.ibiblio.org/pub/mirrors/maven2 to repository list.
------------------------------------
Updated examples/webapps/jsf/pom.xml
Updated examples/webapps/struts/pom.xml
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
----------------------------------------
Updated container/openejb-spring/pom.xml
Updated examples/spring-integration/pom.xml
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>3.0.4.RELEASE</version>
</dependency>
Modified:
openejb/trunk/openejb3/container/openejb-spring/pom.xml
openejb/trunk/openejb3/examples/spring-integration/pom.xml
openejb/trunk/openejb3/examples/webapps/jsf/pom.xml
openejb/trunk/openejb3/examples/webapps/struts/pom.xml
openejb/trunk/openejb3/pom.xml
Modified: openejb/trunk/openejb3/container/openejb-spring/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/pom.xml?rev=997930&r1=997929&r2=997930&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-spring/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-spring/pom.xml Thu Sep 16 21:47:01
2010
@@ -127,6 +127,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>3.0.4.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>3.0.4.RELEASE</version>
</dependency>
Modified: openejb/trunk/openejb3/examples/spring-integration/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/spring-integration/pom.xml?rev=997930&r1=997929&r2=997930&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/spring-integration/pom.xml (original)
+++ openejb/trunk/openejb3/examples/spring-integration/pom.xml Thu Sep 16
21:47:01 2010
@@ -103,6 +103,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>3.0.4.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>3.0.4.RELEASE</version>
</dependency>
Modified: openejb/trunk/openejb3/examples/webapps/jsf/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/jsf/pom.xml?rev=997930&r1=997929&r2=997930&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/jsf/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/jsf/pom.xml Thu Sep 16 21:47:01 2010
@@ -18,116 +18,116 @@
* under the License.
-->
<project>
- <parent>
- <artifactId>webapps</artifactId>
- <groupId>org.apache.openejb</groupId>
- <version>3.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.superbiz.jsf</groupId>
- <artifactId>jsf</artifactId>
- <packaging>war</packaging>
- <name>OpenEJB :: Web Examples :: JSF with MyFaces</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://openejb.apache.org</url>
- <build>
- <finalName>jsf</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
- <configuration>
- <url>http://localhost:8080/manager/html
- </url>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots/>
- <id>apache-maven-snapshots</id>
- <url>http://repository.apache.org/snapshots/
- </url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.2.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.2.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tomahawk
- </groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.6</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <artifactId>jstl</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>6.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <parent>
+ <artifactId>webapps</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.superbiz.jsf</groupId>
+ <artifactId>jsf</artifactId>
+ <packaging>war</packaging>
+ <name>OpenEJB :: Web Examples :: JSF with MyFaces</name>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://openejb.apache.org</url>
+ <build>
+ <finalName>jsf</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <url>http://localhost:8080/manager/html
+ </url>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots/>
+ <id>apache-maven-snapshots</id>
+ <url>http://repository.apache.org/snapshots/
+ </url>
+ </repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/1</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.2.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.2.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tomahawk
+ </groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>1.1.6</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
http://maven.apache.org/plugins/maven-deploy-plugin/
-->
- <distributionManagement>
- <repository>
- <id>localhost</id>
- <url>file://${basedir}/target/repo/</url>
- </repository>
- <snapshotRepository>
- <id>localhost</id>
- <url>file://${basedir}/target/snapshot-repo/</url>
- </snapshotRepository>
- </distributionManagement>
+ <distributionManagement>
+ <repository>
+ <id>localhost</id>
+ <url>file://${basedir}/target/repo/</url>
+ </repository>
+ <snapshotRepository>
+ <id>localhost</id>
+ <url>file://${basedir}/target/snapshot-repo/</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
\ No newline at end of file
Modified: openejb/trunk/openejb3/examples/webapps/struts/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/struts/pom.xml?rev=997930&r1=997929&r2=997930&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/struts/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/struts/pom.xml Thu Sep 16 21:47:01
2010
@@ -16,101 +16,101 @@
-->
<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>
- <groupId>org.superbiz.struts</groupId>
- <artifactId>struts</artifactId>
- <packaging>war</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>OpenEJB :: Web Examples :: Struts</name>
- <url>http://openejb.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>6.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>2.1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-sitemesh-plugin</artifactId>
- <version>2.1.6</version>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.6</version>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- </dependencies>
- <build>
- <finalName>struts</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
- <configuration>
- <url>http://localhost:8080/manager/html</url>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.superbiz.struts</groupId>
+ <artifactId>struts</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>OpenEJB :: Web Examples :: Struts</name>
+ <url>http://openejb.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>2.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-sitemesh-plugin</artifactId>
+ <version>2.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>struts</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <url>http://localhost:8080/manager/html</url>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<!--
This section allows you to configure where to publish libraries for sharing.
It is not required and may be deleted. For more information see:
http://maven.apache.org/plugins/maven-deploy-plugin/
-->
- <distributionManagement>
- <repository>
- <id>localhost</id>
- <url>file://${basedir}/target/repo/</url>
- </repository>
- <snapshotRepository>
- <id>localhost</id>
- <url>file://${basedir}/target/snapshot-repo/</url>
- </snapshotRepository>
- </distributionManagement>
+ <distributionManagement>
+ <repository>
+ <id>localhost</id>
+ <url>file://${basedir}/target/repo/</url>
+ </repository>
+ <snapshotRepository>
+ <id>localhost</id>
+ <url>file://${basedir}/target/snapshot-repo/</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
Modified: openejb/trunk/openejb3/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=997930&r1=997929&r2=997930&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Thu Sep 16 21:47:01 2010
@@ -292,7 +292,7 @@
<module>itests</module>
<module>container</module>
<module>server</module>
- <module>examples</module>
+ <module>examples</module>
</modules>
<profiles>
@@ -459,6 +459,16 @@
</profile>
</profiles>
<repositories>
+ <repository>
+ <id>mirrors.ibiblio.org</id>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
<!--<repository>-->
<!--<id>codehaus-snapshot</id>-->
<!--<name>CodeHaus SNAPSHOT repository</name>-->
