Additional fixes

gatein · Sep 28, 2012 · 83cee29 · 83cee29
1 parent 338474a
commit 83cee29
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 132 deletions.
diff --git a/README.txt b/README.txt
@@ -26,14 +26,9 @@ When the gatein.dev property is set it will build and package one or several ser
 
 The various values for gatein.dev are:
 
-- tomcat     : Tomcat 6 and Tomcat 7
-- tomcat6    : Tomcat 6
 - tomcat7    : Tomcat 7
-- jbossas    : JBoss AS 5 and JBoss AS 6
-- jbossas5   : JBoss AS 5
-- jbosass6   : JBoss AS 6
-- jbossas711 : JBoss AS 7.1.1
-- jbossas712 : JBoss AS 7.1.2
+- jbossas711 : JBoss AS 7.1.1.Final
+- jbossas713 : JBoss AS 7.1.3.Final
 - jetty      : Jetty
 
 
@@ -52,6 +47,8 @@ git clone git://github.com/gatein/gatein-portal.git
 cd gatein-portal
 
 
+You may want to fork it into your own github.com space, and clone your forked version, but that is beyond the scope of this README.
+
 
 2) Prepare containers to use for packaging
 ------------------------------------------
@@ -85,30 +82,6 @@ There are server specific equivalents that have to be used when packaging severa
 
 
 
-  Packaging with JBoss-AS-5.1.0.GA
-  --------------------------------
-
-If you don’t have an existing JBoss AS distribution, the build can automatically download it for you.
-
-Issue the following command:
-
-mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Dgatein.dev=jbossas5 -Ddownload
-
-
-If you have an existing JBoss-AS-5.1.0.GA distribution, unpack it into SERVERS_DIR directory so that you get SERVERS_DIR/jboss-5.1.0.GA directory.
-
-In this case you can issue the following command:
-
-mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Dgatein.dev=jbossas5
-
-
-The packaged GateIn is available in packaging/jboss-as5/pkg/target/jboss.
-
-To start it, go to jboss directory, and run 'bin/run.sh' ('bin\run.bat' on Windows).
-
-Access the portal at: http://localhost:8080/portal
-
-
   Packaging with JBoss-AS-7.x.x
   -----------------------------------
 
@@ -118,7 +91,7 @@ Issue the following command:
 
 mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Dgatein.dev=$AS7_LABEL -Ddownload
 
-Where $AS7_LABEL is one of: jbossas711, or jbossas712.
+Where $AS7_LABEL is one of: jbossas711, or jbossas713.
 
 
 If you have an existing JBoss-AS-7.x.x distribution, unpack it into SERVERS_DIR directory so that you get SERVERS_DIR/jboss-as-7.x.x directory.
@@ -140,30 +113,9 @@ To start it, go to jboss directory, and run 'bin/standalone.sh' ('bin\standalone
 
 Access the portal at: http://localhost:8080/portal
 
-
-  Packaging with JBoss-AS-6.0.0.Final
-  -----------------------------------
-
-If you don’t have an existing JBoss-AS distribution, the build can automatically download it for you.
-
-Issue the following command:
-
-mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Dgatein.dev=jbossas6 -Pdownload
-
-
-If you have an existing JBoss-AS-6.0.0.Final distribution, unpack it into SERVERS_DIR directory so that you get SERVERS_DIR/jboss-6.0.0.Final directory.
-
-In this case you can issue the following command:
-
-mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Dgatein.dev=jbossas6
+For more info about JBoss AS7 support see packaging/jboss-as7/README.txt
 
 
-The packaged GateIn is available in packaging/jboss-as6/pkg/target/jboss.
-
-To start, go to jboss directory, and run 'bin/run.sh' ('bin\run.bat' on Windows)
-
-Access the portal at: http://localhost:8080/portal
-
 
   Packaging with Tomcat 7.x.x
   ---------------------------
@@ -192,32 +144,6 @@ Alternatively you can use 'bin/gatein.sh start' ('bin\gatein.bat start' on Windo
 Access the portal at: http://localhost:8080/portal
 
 
-  Packaging with Tomcat 6.x.x
-  ---------------------------
-
-If you don’t have an existing Tomcat 6.x.x distribution, the build can automatically download it for you.
-
-Issue the following command:
-
-mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Dgatein.dev=tomcat6 -Pdownload
-
-
-If you have an existing Tomcat 6.x.x distribution, unpack it into SERVERS_DIR directory so that you get SERVERS_DIR/apache-tomcat-6.x.x directory.
-
-In this case you can issue the following command:
-
-mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Dgatein.dev=tomcat6 -Dserver.name=apache-tomcat-6.x.x
-
-(fix tomcat version in 'server.name')
-
-
-The packaged GateIn is available in packaging/tomcat/pkg/tc6/target/tomcat6.
-
-To start, go to tomcat6 directory, and run 'bin/gatein.sh run' ('bin\gatein.bat run' on Windows).
-Alternatively you can use 'bin/gatein.sh start' ('bin\gatein.bat start' on Windows).
-
-Access the portal at: http://localhost:8080/portal
-
 
   Packaging with Jetty 6.x.x
   ---------------------------
@@ -257,11 +183,12 @@ mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Ddownload
 
 You can also specify server names for each container - for example:
 
-mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Djboss5.name=jboss-5.1.0 -Djboss7.name=jboss-7.1.0 -Djboss6.name=jboss-6.0.0 -Dtomcat6.name=tomcat-6.0.35 -Dtomcat7.name=tomcat-7.0.19 -Djetty.name=jetty-6.0.24
+mvn install -DskipTests -Dservers.dir=$SERVERS_DIR -Djboss7.name=jboss-7.1.0 -Dtomcat7.name=tomcat-7.0.19 -Djetty.name=jetty-6.0.24
+
 
+For JBoss AS7 packaging the version used in this case would be 7.1.1.Final. If you want to use a different version you have to specify it with -Dversion.jboss.as=.
+Valid values are: 7.1.1.Final, and 7.1.3.Final
 
-For JBoss AS7 packaging the version used in this case would be 7.1.0.Final. If you want to use a different version you have to specify it with -Dversion.jboss.as=.
-Valid values are: 7.1.0.Final, 7.1.1.Final, and 7.1.2.Final
 
 
 Release instructions
@@ -274,6 +201,7 @@ mvn release:prepare
 mvn release:perform
 
 
+
 Troubleshooting
 ===============
 

diff --git a/packaging/jboss-as7/README.txt b/packaging/jboss-as7/README.txt
@@ -49,7 +49,7 @@ mvn clean install -DskipTests -Dservers.dir=$SERVERS_DIR -Dgatein.dev=jbossas713
 This will look for jboss-as-7.1.3.Final directory inside your $SERVERS_DIR.
 
 
-The packaged GateIn is available in packaging/jboss-as7/pkg/target/jboss-as-7.x.x.y.
+The packaged GateIn is available in packaging/jboss-as7/pkg/target/jboss-as-7.x.x.
 
 To start it, go to jboss directory, and run 'bin/standalone.sh' ('bin\standalone.bat' on Windows).
 
@@ -66,17 +66,17 @@ GateIn deployment archives are located in JBOSS_HOME/gatein containing the follo
 
  - gatein.ear
 
-   This is the application archive containing GateIn portal. The libraries are statically deployed as jboss-modules under JBOSS_HOME/modules.
+   This is the application archive containing GateIn portal. The libraries are available as modules under JBOSS_HOME/modules, and are not part of the deployment archive.
 
  - extensions/
 
-   This is a directory that contains all the portal extensions to be installed into GateIn when it starts.
-   Any archives that perform integration with GateIn kernel via configuration.xml files, or take part in GateIn's extension mechanism in order to override the default portal behaviour should be placed in this directory.
-   At boot time GateIn will scan the directory and deploy, and integrate these archive into the portal.
-   This directory does not support hot deploy, and should not be used for ordinary portlet archives, that just provide portlets. Regular AS7 deployment mechanisms like JBOSS_HOME/standalone/deployments directory, CLI admin client, web admin console, or maven jboss-as:deploy are the appropriate mechanisms to use in that case.
+   This is a directory that contains all the portal extensions to be installed when GateIn starts.
+   Any archives that perform integration with GateIn kernel using configuration.xml files, or take part in GateIn's extension mechanism in order to override the default portal behaviour should be placed in this directory.
+   At boot time GateIn will scan the directory and deploy containing archives.
+   This directory does not support hot re-deploy, and should not be used for ordinary portlet archives, that only provide portlets. Regular AS7 deployment mechanisms like JBOSS_HOME/standalone/deployments directory, CLI admin client, web admin console, or maven jboss-as:deploy are the appropriate mechanisms to use in that case.
 
 
-Portlet archives are web applications that contain portlet.xml file as per Portlet Specification. GateIn automatically provides some libraries to these archives so that they can properly integrate with the portal.
+Portlet archives are web applications that contain portlet.xml file as per Portlet Specification. GateIn automatically provides some libraries to these applications so that they can properly integrate with the portal.
 The list of libraries provided to portlet archives by default can be configured via JBOSS_HOME/standalone/configuration/standalone.xml which contains the following default configuration:
 
        <subsystem xmlns="urn:jboss:domain:gatein:1.0">
@@ -87,7 +87,7 @@ The list of libraries provided to portlet archives by default can be configured
             </portlet-war-dependencies>
         </subsystem>
 
-JBoss AS7 provides mechanisms for configuring modules visibility for each individual deployment archive (i.e.: Dependencies attribute in MANIFEST.MF, or jboss-deployment-structure.xml).
+JBoss AS7 provides mechanisms for configuring which modules are visible to a specific deployment archive (i.e.: Dependencies attribute in MANIFEST.MF, or jboss-deployment-structure.xml).
 
 
 
@@ -107,14 +107,14 @@ cd packaging/jboss-as7/pkg/target/
 cp -r jboss ~/gatein-node1
 cp -r jboss ~/gatein-node2
 
-Now open two more consoles, and in all of them 'cd $HOME'.
+Now open three consoles, and in all of them do 'cd $HOME'.
 
-Now in first console run the database:
+In first console run the database:
 
 java -cp gatein-node1/modules/com/h2database/h2/main/h2-1.3.168.jar org.h2.tools.Server
 
 
-In second console run first GateIn node
+In second console run the first GateIn node:
 
 cd gatein-node1
 bin/standalone.sh --server-config=standalone-ha.xml -Djboss.node.name=node1 -Djboss.socket.binding.port-offset=100 -Dexo.profiles=cluster
@@ -126,7 +126,7 @@ cd gatein-node2
 bin/standalone.sh --server-config=standalone-ha.xml -Djboss.node.name=node2 -Djboss.socket.binding.port-offset=200 -Dexo.profiles=cluster
 
 
-Point your browser to http://localhost:8180/portal for first instance, and http://localhost:8280/portal for second instance.
+Point your browser to http://localhost:8180/portal to access the first instance, and http://localhost:8280/portal for the second instance.
 
 
 

diff --git a/packaging/pom.xml b/packaging/pom.xml
@@ -72,19 +72,6 @@
                 <module>tomcat</module>
             </modules>
         </profile>
-        <profile>
-            <id>pkg-tomcat6</id>
-            <activation>
-                <property>
-                    <name>gatein.dev</name>
-                    <value>tomcat6</value>
-                </property>
-            </activation>
-            <modules>
-                <module>common</module>
-                <module>tomcat</module>
-            </modules>
-        </profile>
         <profile>
             <id>pkg-jetty</id>
             <activation>
@@ -111,30 +98,6 @@
               <module>jboss-as7</module>
             </modules>
         </profile>
-        <profile>
-            <id>pkg-jbossas6</id>
-            <activation>
-                <property>
-                    <name>gatein.dev</name>
-                    <value>jbossas6</value>
-                </property>
-            </activation>
-            <modules>
-                <module>common</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>pkg-jbossas5</id>
-            <activation>
-                <property>
-                    <name>gatein.dev</name>
-                    <value>jbossas5</value>
-                </property>
-            </activation>
-            <modules>
-                <module>common</module>
-            </modules>
-        </profile>
         <profile>
             <id>pkg-jbossas711</id>
             <activation>

diff --git a/pom.xml b/pom.xml
@@ -1209,6 +1209,44 @@ memory option properties. This should be removed when we can just set the compil
             <module>docs</module>
          </modules>
       </profile>
+      <profile>
+         <id>pkg-jbossas710</id>
+         <activation>
+            <property>
+               <name>gatein.dev</name>
+               <value>jbossas710</value>
+            </property>
+         </activation>
+
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-enforcer-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>check-servers-dir-specified</id>
+                        <goals>
+                           <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                           <rules>
+                              <requireProperty>
+                                 <message>"
+
+Build profile 'jbossas710' is no longer supported. You may want to use: 'jbossas711'.
+
+"
+                                 </message>
+                              </requireProperty>
+                           </rules>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
       <profile>
          <id>pkg-jbossas712</id>
          <activation>