Author: thomas.heute(a)jboss.com Date: 2010-04-27 07:20:01 -0400 (Tue, 27 Apr 2010) New Revision: 2826 Modified: components/pc/trunk/api/pom.xml components/pc/trunk/api/src/main/java/org/gatein/pc/api/spi/PortalContext.java components/pc/trunk/bridge/pom.xml components/pc/trunk/controller/pom.xml components/pc/trunk/distrib/distrib.xml components/pc/trunk/docs/pom.xml components/pc/trunk/docs/user-guide/pom.xml components/pc/trunk/federation/pom.xml components/pc/trunk/jsr168api/pom.xml components/pc/trunk/management/pom.xml components/pc/trunk/mc/pom.xml components/pc/trunk/pom.xml components/pc/trunk/portal/pom.xml components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml components/pc/trunk/portal/src/build.xml components/pc/trunk/portlet/pom.xml components/pc/trunk/samples/pom.xml components/pc/trunk/test/pom.xml components/pc/trunk/test/src/test/build.xml components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java Log: Rollbacking and using the old repo (+ Nexus for the parent Updated version) Modified: components/pc/trunk/api/pom.xml =================================================================== --- components/pc/trunk/api/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/api/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.pc</groupId> Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/spi/PortalContext.java =================================================================== --- components/pc/trunk/api/src/main/java/org/gatein/pc/api/spi/PortalContext.java 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/spi/PortalContext.java 2010-04-27 11:20:01 UTC (rev 2826) @@ -36,7 +36,7 @@ */ public interface PortalContext { - public static final Version VERSION = new Version("GateIn Portlet Container", 2, 1, 0, new Version.Qualifier(Version.Qualifier.Prefix.CR, Version.Qualifier.Suffix.SUFFIX_2), "Community"); + public static final Version VERSION = new Version("GateIn Portlet Container", 2, 1, 1, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Community"); /** * Return info about the portal. Must conform to javax.portlet.PortalContext.getPortalInfo(). Modified: components/pc/trunk/bridge/pom.xml =================================================================== --- components/pc/trunk/bridge/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/bridge/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-bridge</artifactId> Modified: components/pc/trunk/controller/pom.xml =================================================================== --- components/pc/trunk/controller/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/controller/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-controller</artifactId> @@ -42,6 +42,10 @@ <dependency> <groupId>apache-xerces</groupId> + <artifactId>resolver</artifactId> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> <artifactId>xercesImpl</artifactId> </dependency> <dependency> Modified: components/pc/trunk/distrib/distrib.xml =================================================================== --- components/pc/trunk/distrib/distrib.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/distrib/distrib.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,9 +2,9 @@ <property name="source.dir" value="../"/> <property name="src.docs.dir" value="${source.dir}/docs"/> - <property name="pc.release.version" value="2.1.0-GA"/> - <property name="demo.release.version" value="2.1.0-GA"/> - <property name="maven.version" value="2.1.0-GA"/> + <property name="pc.release.version" value="2.1.1-GA"/> + <property name="demo.release.version" value="2.1.1-GA"/> + <property name="maven.version" value="2.1.1-GA"/> <!-- --> <property name="pc.release.name" value="gatein-portletcontainer-${pc.release.version}"/> Modified: components/pc/trunk/docs/pom.xml =================================================================== --- components/pc/trunk/docs/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/docs/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -3,7 +3,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <artifactId>docs-aggregator</artifactId> <packaging>pom</packaging> Modified: components/pc/trunk/docs/user-guide/pom.xml =================================================================== --- components/pc/trunk/docs/user-guide/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/docs/user-guide/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -9,7 +9,7 @@ </parent> <groupId>org.gatein.pc</groupId> <artifactId>user-guide-${translation}</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> <packaging>jdocbook</packaging> <name>GateIn - Portlet Container (User Guide ${translation})</name> @@ -64,4 +64,10 @@ </releases> </pluginRepository> </pluginRepositories> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/maven/d... + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/m... + <url>http://fisheye.jboss.org/browse/gatein/tools/maven/doc-parent/tags... + </scm> </project> Modified: components/pc/trunk/federation/pom.xml =================================================================== --- components/pc/trunk/federation/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/federation/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-federation</artifactId> Modified: components/pc/trunk/jsr168api/pom.xml =================================================================== --- components/pc/trunk/jsr168api/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/jsr168api/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-jsr168api</artifactId> Modified: components/pc/trunk/management/pom.xml =================================================================== --- components/pc/trunk/management/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/management/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-management</artifactId> Modified: components/pc/trunk/mc/pom.xml =================================================================== --- components/pc/trunk/mc/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/mc/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-mc</artifactId> Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -6,7 +6,7 @@ <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> <packaging>pom</packaging> <parent> @@ -16,16 +16,16 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc... - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/compone... - <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk/</ur... + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc... + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/compone... + <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.1.1-GA... </scm> <properties> <version.gatein.common>2.0.2-GA</version.gatein.common> <version.gatein.wci>2.0.1-GA</version.gatein.wci> <version.apache.portals.bridges>1.0.4</version.apache.portals.bridges> - <version.javax.jstl>1.1.2</version.javax.jstl> + <version.apache.taglibs>1.1.2</version.apache.taglibs> <version.apache.log4j>1.2.14</version.apache.log4j> <!-- used in test module by maven-antrun-extended-plugin --> @@ -112,10 +112,15 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>apache-taglibs</groupId> <artifactId>jstl</artifactId> - <version>${version.javax.jstl}</version> + <version>${version.apache.taglibs}</version> </dependency> + <dependency> + <groupId>apache-taglibs</groupId> + <artifactId>standard</artifactId> + <version>${version.apache.taglibs}</version> + </dependency> </dependencies> </dependencyManagement> @@ -238,6 +243,7 @@ </profiles> <repositories> + <repository> <id>jboss-public-repository-group</id> <name>JBoss Public Maven Repository Group</name> @@ -252,14 +258,27 @@ <updatePolicy>never</updatePolicy> </snapshots> </repository> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <layout>default</layout> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> </repositories> - <pluginRepositories> - <pluginRepository> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/2/</url> - </pluginRepository> - </pluginRepositories> - </project> Modified: components/pc/trunk/portal/pom.xml =================================================================== --- components/pc/trunk/portal/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/portal/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portal</artifactId> @@ -87,9 +87,13 @@ <!-- JSTL for Tomcat --> <dependency> - <groupId>javax.servlet</groupId> + <groupId>apache-taglibs</groupId> <artifactId>jstl</artifactId> </dependency> + <dependency> + <groupId>apache-taglibs</groupId> + <artifactId>standard</artifactId> + </dependency> <dependency> <groupId>apache-log4j</groupId> Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml =================================================================== --- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -31,9 +31,11 @@ <include>sun-jaxb:jaxb-api</include> <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> <include>apache-xerces:xml-apis</include> - <include>javax.servlet:jstl</include> + <include>apache-taglibs:jstl</include> + <include>apache-taglibs:standard</include> </includes> </dependencySet> Modified: components/pc/trunk/portal/src/build.xml =================================================================== --- components/pc/trunk/portal/src/build.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/portal/src/build.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -54,6 +54,7 @@ </path> <path id="mc.xerces"> <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.resolver.jar}"/> <pathelement path="${dependency.xml-apis.jar}"/> </path> <path id="mc.javassist"> Modified: components/pc/trunk/portlet/pom.xml =================================================================== --- components/pc/trunk/portlet/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/portlet/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-portlet</artifactId> Modified: components/pc/trunk/samples/pom.xml =================================================================== --- components/pc/trunk/samples/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/samples/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-samples</artifactId> Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/test/pom.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.pc</groupId> <artifactId>pc-parent</artifactId> - <version>2.1.1-GA-SNAPSHOT</version> + <version>2.1.1-GA</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pc-test</artifactId> @@ -173,9 +173,13 @@ <!-- JSTL for Tomcat --> <dependency> - <groupId>javax.servlet</groupId> + <groupId>apache-taglibs</groupId> <artifactId>jstl</artifactId> </dependency> + <dependency> + <groupId>apache-taglibs</groupId> + <artifactId>standard</artifactId> + </dependency> </dependencies> <profiles> @@ -271,8 +275,6 @@ </profile> </profiles> - - <build> <plugins> <plugin> @@ -384,6 +386,7 @@ <!-- <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}" /> --> <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}" /> <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}" /> + <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}" /> <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}" /> <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}" /> <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}" /> @@ -393,7 +396,8 @@ <property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}" /> <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}" /> - <property name="dependency.apache-jstl.jar" value="${maven.dependency.javax.servlet.jstl.jar.path}" /> + <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}" /> + <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}" /> <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}" /> <ant antfile="${basedir}/src/test/build.xml"> Modified: components/pc/trunk/test/src/test/build.xml =================================================================== --- components/pc/trunk/test/src/test/build.xml 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/test/src/test/build.xml 2010-04-27 11:20:01 UTC (rev 2826) @@ -147,6 +147,7 @@ <path refid="jboss-microcontainer"/> <pathelement path="${dependency.javassist.jar}"/> <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.resolver.jar}"/> <pathelement path="${dependency.xml-apis.jar}"/> <pathelement path="${dependency.trove.jar}"/> </path> @@ -175,6 +176,7 @@ <path refid="jboss-microcontainer"/> <pathelement path="${dependency.javassist.jar}"/> <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.resolver.jar}"/> <pathelement path="${dependency.xml-apis.jar}"/> <pathelement path="${dependency.trove.jar}"/> </path> Modified: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java =================================================================== --- components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2010-04-27 10:56:47 UTC (rev 2825) +++ components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2010-04-27 11:20:01 UTC (rev 2826) @@ -47,7 +47,7 @@ { /** . */ - private static final String VERSION_REGEX = "GateInPortletContainer/[0-9]+\\.[0-9]+(|\\.CR[0-9]{2})(|\\.SNAPSHOT)(|\\.ALPHA[0-9]{2})(|\\.BETA[0-9]{2})(|\\.SP[0-9]{2})(|\\.CP[0-9]{2})"; + private static final String VERSION_REGEX = "GateInPortletContainer/[0-9]+\\.[0-9]+(|\\.CR[0-9]{2})(|\\.SNAPSHOT)(|\\.ALPHA[0-9]{2})(|\\.BETA[0-9]{2})(|\\.SP[0-9]{2})(|\\.CP[0-9]{2})(|\\.GA)"; /** . */ private static final Pattern VERSION_PATTERN = Pattern.compile(VERSION_REGEX, Pattern.CASE_INSENSITIVE);