February 2011 - gatein-commits - Jboss List Archives

gatein SVN: r5843 - in portal/trunk/packaging/tomcat/pkg: src/main/resources/tomcat/bin and 1 other directory.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-02-01 14:00:58 -0500 (Tue, 01 Feb 2011) New Revision: 5843 Removed: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/commons-logging.properties Modified: portal/trunk/packaging/tomcat/pkg/pom.xml Log: GTNPORTAL-1774 : Improve tomcat configuration/packaging Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-02-01 19:00:06 UTC (rev 5842) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-02-01 19:00:58 UTC (rev 5843) @@ -38,6 +38,10 @@ <artifactId>slf4j-jdk14</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -84,10 +88,6 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> </dependency> Deleted: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/commons-logging.properties =================================================================== --- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/commons-logging.properties 2011-02-01 19:00:06 UTC (rev 5842) +++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/bin/commons-logging.properties 2011-02-01 19:00:58 UTC (rev 5843) @@ -1,3 +0,0 @@ -# Configure commons logging to use JDK logger -org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl -org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger

13 years, 11 months

1
0
0 / 0

gatein SVN: r5842 - portal/trunk/packaging/jetty/pkg.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-02-01 14:00:06 -0500 (Tue, 01 Feb 2011) New Revision: 5842 Modified: portal/trunk/packaging/jetty/pkg/pom.xml Log: GTNPORTAL-1773 : Improve jetty configuration (remove commons logging dependency) Modified: portal/trunk/packaging/jetty/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/pom.xml 2011-02-01 18:49:36 UTC (rev 5841) +++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-02-01 19:00:06 UTC (rev 5842) @@ -92,10 +92,6 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> </dependency>

13 years, 11 months

1
0
0 / 0

gatein SVN: r5841 - in portal/trunk/packaging: dependencies and 4 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-02-01 13:49:36 -0500 (Tue, 01 Feb 2011) New Revision: 5841 Added: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/webdefault.xml portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/logging.properties Removed: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties Modified: portal/trunk/packaging/dependencies/pom.xml portal/trunk/packaging/jetty/pkg/pom.xml portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh portal/trunk/packaging/pom.xml Log: GTNPORTAL-1773 : Improve jetty configuration - also need the dependency over the dependencies pom for tomcat and jetty (was forgotten in a previous commit) Modified: portal/trunk/packaging/dependencies/pom.xml =================================================================== --- portal/trunk/packaging/dependencies/pom.xml 2011-02-01 18:46:19 UTC (rev 5840) +++ portal/trunk/packaging/dependencies/pom.xml 2011-02-01 18:49:36 UTC (rev 5841) @@ -15,6 +15,13 @@ <dependencies> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${org.slf4j.version}</version> + </dependency> +  <dependency> <groupId>org.jboss</groupId> Modified: portal/trunk/packaging/jetty/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/pom.xml 2011-02-01 18:46:19 UTC (rev 5840) +++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-02-01 18:49:36 UTC (rev 5841) @@ -42,6 +42,10 @@ <artifactId>slf4j-jdk14</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> Deleted: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties =================================================================== --- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties 2011-02-01 18:46:19 UTC (rev 5840) +++ portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/commons-logging.properties 2011-02-01 18:49:36 UTC (rev 5841) @@ -1,3 +0,0 @@ -# Configure commons logging to use JDK logger -org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl -org.apache.commons.logging.Log=org.apache.commons.logging.impl.Jdk14Logger Modified: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh =================================================================== --- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh 2011-02-01 18:46:19 UTC (rev 5840) +++ portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/bin/gatein.sh 2011-02-01 18:49:36 UTC (rev 5841) @@ -27,7 +27,7 @@ # Sets some variables LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" SECURITY_OPTS="-Djava.security.auth.login.config=etc/login.conf" -EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true" +EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein/conf -Djava.awt.headless=true -Djava.util.logging.config.file=gatein/conf/logging.properties" GATEIN_OPTS="" while getopts "D:" OPTION Added: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/webdefault.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/webdefault.xml (rev 0) +++ portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/webdefault.xml 2011-02-01 18:49:36 UTC (rev 5841) @@ -0,0 +1,412 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + + + + + + + + + + + + + + + + +<web-app + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + metadata-complete="true" + version="2.5"> + + <description> + Default web.xml file. + This file is applied to a Web application before it's own WEB_INF/web.xml file + </description> + + +  +  +  +  + + <context-param> + <param-name>org.mortbay.jetty.servlet.SessionPath</param-name> + <param-value>/</param-value> + </context-param> + +  + + <context-param> + <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name> + <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value> + </context-param> + + + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + <servlet> + <servlet-name>default</servlet-name> + <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class> + <init-param> + <param-name>acceptRanges</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>dirAllowed</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>welcomeServlets</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>redirectWelcome</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>maxCacheSize</param-name> + <param-value>256000000</param-value> + </init-param> + <init-param> + <param-name>maxCachedFileSize</param-name> + <param-value>10000000</param-value> + </init-param> + <init-param> + <param-name>maxCachedFiles</param-name> + <param-value>1000</param-value> + </init-param> + <init-param> + <param-name>cacheType</param-name> + <param-value>both</param-value> + </init-param> + <init-param> + <param-name>gzip</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>useFileMappedBuffer</param-name> + <param-value>true</param-value> + </init-param> +  + <load-on-startup>0</load-on-startup> + </servlet> + + <servlet-mapping> <servlet-name>default</servlet-name> <url-pattern>/</url-pattern> </servlet-mapping> + + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + <servlet id="jsp"> + <servlet-name>jsp</servlet-name> + <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class> + <init-param> + <param-name>logVerbosityLevel</param-name> + <param-value>DEBUG</param-value> + </init-param> + <init-param> + <param-name>fork</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>xpoweredBy</param-name> + <param-value>false</param-value> + </init-param> +  + <load-on-startup>0</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>jsp</servlet-name> + <url-pattern>*.jsp</url-pattern> + <url-pattern>*.jspf</url-pattern> + <url-pattern>*.jspx</url-pattern> + <url-pattern>*.xsp</url-pattern> + <url-pattern>*.JSP</url-pattern> + <url-pattern>*.JSPF</url-pattern> + <url-pattern>*.JSPX</url-pattern> + <url-pattern>*.XSP</url-pattern> + </servlet-mapping> + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + + + +  + <session-config> + <session-timeout>30</session-timeout> + </session-config> + +  +  +  +  +  +  +  + +  + <welcome-file-list> + <welcome-file>index.html</welcome-file> + <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + +  + <locale-encoding-mapping-list> + <locale-encoding-mapping><locale>ar</locale><encoding>ISO-8859-6</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>be</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>bg</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>ca</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>cs</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>da</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>de</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>el</locale><encoding>ISO-8859-7</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>en</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>es</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>et</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>fi</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>fr</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>hr</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>hu</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>is</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>it</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>iw</locale><encoding>ISO-8859-8</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>ja</locale><encoding>Shift_JIS</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>ko</locale><encoding>EUC-KR</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>lt</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>lv</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>mk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>nl</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>no</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>pl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>pt</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>ro</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>ru</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>sh</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>sk</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>sl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>sq</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>sr</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>sv</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>tr</locale><encoding>ISO-8859-9</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>uk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping> + <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping> + </locale-encoding-mapping-list> + + <security-constraint> + <web-resource-collection> + <web-resource-name>Disable TRACE</web-resource-name> + <url-pattern>/</url-pattern> + <http-method>TRACE</http-method> + </web-resource-collection> + <auth-constraint/> + </security-constraint> + +</web-app> + Added: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/logging.properties =================================================================== --- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/logging.properties (rev 0) +++ portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/gatein/conf/logging.properties 2011-02-01 18:49:36 UTC (rev 5841) @@ -0,0 +1,54 @@ +############################################################ +# Default Logging Configuration File +# +# You can use a different file by specifying a filename +# with the java.util.logging.config.file system property. +# For example java -Djava.util.logging.config.file=myfile +############################################################ + +############################################################ +# Global properties +############################################################ + +# "handlers" specifies a comma separated list of log Handler +# classes. These handlers will be installed during VM startup. +# Note that these classes must be on the system classpath. +# By default we only configure a ConsoleHandler, which will only +# show messages at the INFO and above levels. +handlers= java.util.logging.ConsoleHandler + +# To also add the FileHandler, use the following line instead. +#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler + +# Default global logging level. +# This specifies which kinds of events are logged across +# all loggers. For any given facility this global level +# can be overriden by a facility specific level +# Note that the ConsoleHandler also has a separate level +# setting to limit messages printed to the console. +.level= INFO + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +# default file output is in user's home directory. +java.util.logging.FileHandler.pattern = %h/java%u.log +java.util.logging.FileHandler.limit = 50000 +java.util.logging.FileHandler.count = 1 +java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter + +# Limit the message that are printed on the console to INFO and above. +java.util.logging.ConsoleHandler.level = INFO +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +com.xyz.foo.level = SEVERE \ No newline at end of file Modified: portal/trunk/packaging/pom.xml =================================================================== --- portal/trunk/packaging/pom.xml 2011-02-01 18:46:19 UTC (rev 5840) +++ portal/trunk/packaging/pom.xml 2011-02-01 18:49:36 UTC (rev 5841) @@ -52,6 +52,7 @@ <profile> <id>pkg-tomcat7</id> <modules> + <module>dependencies</module> <module>tomcat</module> <module>reports</module> </modules> @@ -59,6 +60,7 @@ <profile> <id>pkg-jetty</id> <modules> + <module>dependencies</module> <module>jetty</module> <module>reports</module> </modules>

13 years, 11 months

1
0
0 / 0

gatein SVN: r5840 - portal/trunk/component/common/src/main/java/conf.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-02-01 13:46:19 -0500 (Tue, 01 Feb 2011) New Revision: 5840 Modified: portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties Log: use ${jetty.home} for configuring gatein data dir in jetty Modified: portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-02-01 17:07:41 UTC (rev 5839) +++ portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-02-01 18:46:19 UTC (rev 5840) @@ -18,7 +18,7 @@ # # Data -gatein.data.dir=../gatein/data +gatein.data.dir=${jetty.home}/gatein/data # DB gatein.db.data.dir=${gatein.data.dir}/db

13 years, 11 months

1
0
0 / 0

gatein SVN: r5839 - in portal/trunk/packaging: jboss-as6/pkg and 1 other directory.

by do-not-reply＠jboss.org

Author: mstruk Date: 2011-02-01 12:07:41 -0500 (Tue, 01 Feb 2011) New Revision: 5839 Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as6/pkg/pom.xml Log: GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager - added support for gatein.working.dir Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-02-01 16:46:44 UTC (rev 5838) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-02-01 17:07:41 UTC (rev 5839) @@ -25,7 +25,8 @@ <jbossas.path>${servers.dir}</jbossas.path> <jbossas.name>jboss-${jbossas.version}</jbossas.name> <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir> - <jbossas.target.dir>${project.build.directory}/jboss</jbossas.target.dir> + <gatein.working.dir>${project.build.directory}/jboss</gatein.working.dir> + <jbossas.target.dir>${gatein.working.dir}</jbossas.target.dir> </properties> <dependencies> Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-02-01 16:46:44 UTC (rev 5838) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-02-01 17:07:41 UTC (rev 5839) @@ -19,11 +19,12 @@ <properties> <jbossas.version>6.0.0.Final</jbossas.version> <jbossas.dist.version>${jbossas.version}</jbossas.dist.version> - <servers.dir>${exo.projects.directory.dependencies}</servers.dir> + <servers.dir>${project.basedir}/../../servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> - <jbossas.name>${exo.projects.app.jboss6.version}</jbossas.name> + <jbossas.name>jboss-${jbossas.version}</jbossas.name> <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir> - <jbossas.target.dir>${project.build.directory}/jboss</jbossas.target.dir> + <gatein.working.dir>${project.build.directory}/jboss</gatein.working.dir> + <jbossas.target.dir>${gatein.working.dir}</jbossas.target.dir> </properties> <dependencies> @@ -902,114 +903,168 @@ </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>check-jboss-environment-ready</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>jbossas.path</property> + <message>" +You must define the property 'jbossas.path' +to give the path to the directory where you store your applications servers. +" + </message> + </requireProperty> + <requireProperty> + <property>jbossas.name</property> + <message>" +You must define the property 'jbossas.name' +to give the name of the directory where JBoss AS is stored. +" + </message> + </requireProperty> + <requireFilesExist> + <files> + <file>${jbossas.path}/${jbossas.name}/</file> + </files> + <message>" +The following JBoss AS directory doesn't exist : + ${jbossas.path}/${jbossas.name} +Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location of servers directory +and/or -Djbossas.name=NAME to point to the correct directory under the servers directory. +You can also use -Pdownload to automatically provide JBoss AS instance. +" + </message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>prepare-package</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> + <target name="package"/> + <property name="maven.project.basedir" value="${project.basedir}"/> + <property name="maven.project.build.directory" value="${project.build.directory}"/> + </ant> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> <profile> - <id>download</id> + <id>pkg-jbossas6</id> + + <properties> + <exo.projects.app.jboss5.version>jboss-6.0.0.Final</exo.projects.app.jboss5.version> + <servers.dir>${exo.projects.directory.dependencies}</servers.dir> + <jbossas.name>${exo.projects.app.jboss6.version}</jbossas.name> + </properties> + <build> <plugins> <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> - <id>auto-clean</id> - <phase>initialize</phase> + <id>check-jboss-legacy-environment-dependencies-dir</id> <goals> - <goal>clean</goal> + <goal>enforce</goal> </goals> + <configuration> + <rules> + <requireProperty> + <property>exo.projects.directory.dependencies</property> + <message>" +You must define the property 'exo.projects.directory.dependencies' +to specify the path to the directory where you store your application servers. +" + </message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> <execution> - <id>prepare-package</id> - <phase>prepare-package</phase> + <id>check-jboss-legacy-environment-jboss-name</id> <goals> - <goal>run</goal> + <goal>enforce</goal> </goals> <configuration> - <target> - <property name="jbossas.zip" - value="${jbossas.path}/jboss-as-distribution-${jbossas.dist.version}.zip"/> - -  - <mkdir dir="${jbossas.path}"/> - -  - <ant antfile="${project.basedir}/download-jboss.xml"> - <target name="download-jboss"/> - <property name="url" - value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..."/> - <property name="dest" value="${jbossas.zip}"/> - </ant> - - <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/> - - <fail if="jbossas.dir.exists">Destination JBoss AS directory exists already: ${jbossas.dir} (Won't overwrite!) -Delete the directory manually, or provide alternative JBoss AS location by using -Dserver.dir=PATH - </fail> - -  - <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/> - - <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> - </ant> - </target> + <rules> + <requireProperty> + <property>exo.projects.app.jboss6.version</property> + <message>" +You must define the property 'exo.projects.app.jboss6.version' +to specify the name of the directory where JBoss AS is stored. +" + </message> + </requireProperty> + </rules> + <fail>true</fail> </configuration> </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>pack</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> <execution> - <id>jboss-check-environment-ready</id> + <id>check-jboss-dir-exists</id> <goals> <goal>enforce</goal> </goals> <configuration> <rules> - <requireProperty> - <property>jbossas.path</property> - <message>"You must define the property jbossas.path to give the path to the directory - where you store your applications servers" - </message> - </requireProperty> - <requireProperty> - <property>jbossas.name</property> - <message>"You must define the property jbossas.name to give the name of the directory - where JBoss AS is stored" - </message> - </requireProperty> <requireFilesExist> <files> - <file>${jbossas.path}/${jbossas.name}/</file> + <file>${exo.projects.directory.dependencies}/${exo.projects.app.jboss6.version}/ + </file> </files> - <message>"The following JBoss AS directory doesn't exist : - ${jbossas.path}/${jbossas.name} + <message>" +The following JBoss AS directory doesn't exist : + ${exo.projects.directory.dependencies}/${exo.projects.app.jboss6.version} -Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location. +Make JBoss AS instance available at that location, or use -Dexo.projects.directory.dependencies=PATH to point to the correct location +of servers directory and/or -Dexo.projects.app.jboss6.version=NAME to point to the correct directory under the servers directory. You can also use -Pdownload to automatically provide JBoss AS instance. " </message> @@ -1018,19 +1073,37 @@ <fail>true</fail> </configuration> </execution> + <execution> + <id>check-jboss-environment-ready</id> + <phase>none</phase> + </execution> </executions> </plugin> + + </plugins> + </build> + </profile> + + <profile> + <id>download</id> + <build> + <plugins> <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> - <id>auto-clean</id> - <phase>initialize</phase> - <goals> - <goal>clean</goal> - </goals> + <id>check-jboss-environment-ready</id> + <phase>none</phase> </execution> + <execution> + <id>check-jboss-legacy-environment-jboss-name</id> + <phase>none</phase> + </execution> + <execution> + <id>check-jboss-dir-exists</id> + <phase>none</phase> + </execution> </executions> </plugin> <plugin> @@ -1046,6 +1119,33 @@ </goals> <configuration> <target> + <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/> + + <fail if="jbossas.dir.exists">" +Destination JBossAS directory exists already: + ${jbossas.dir} + +Either rename it, delete it, or deactivate -Pdownload profile. +" + </fail> + + <property name="jbossas.zip" + value="${jbossas.path}/jboss-as-distribution-${jbossas.dist.version}.zip"/> + +  + <mkdir dir="${jbossas.path}"/> + +  + <ant antfile="${project.basedir}/download-jboss.xml"> + <target name="download-jboss"/> + <property name="url" + value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..."/> + <property name="dest" value="${jbossas.zip}"/> + </ant> + +  + <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/> + <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> <target name="package"/> <property name="maven.project.basedir" value="${project.basedir}"/> @@ -1090,4 +1190,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project>

13 years, 11 months

1
0
0 / 0

gatein SVN: r5838 - portal/trunk/packaging/dependencies.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-02-01 11:46:44 -0500 (Tue, 01 Feb 2011) New Revision: 5838 Modified: portal/trunk/packaging/dependencies/pom.xml Log: no need for now for the empty profile section in the dependencies module Modified: portal/trunk/packaging/dependencies/pom.xml =================================================================== --- portal/trunk/packaging/dependencies/pom.xml 2011-02-01 16:38:53 UTC (rev 5837) +++ portal/trunk/packaging/dependencies/pom.xml 2011-02-01 16:46:44 UTC (rev 5838) @@ -302,12 +302,4 @@ </dependencyManagement> - <profiles> - <profile> - <id>pkg-tomcat</id> - <dependencies> - </dependencies> - </profile> - </profiles> - </project> \ No newline at end of file

13 years, 11 months

1
0
0 / 0

gatein SVN: r5837 - in portal/trunk/packaging: dependencies and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-02-01 11:38:53 -0500 (Tue, 01 Feb 2011) New Revision: 5837 Added: portal/trunk/packaging/dependencies/ portal/trunk/packaging/dependencies/pom.xml Modified: portal/trunk/packaging/jetty/pkg/pom.xml portal/trunk/packaging/pom.xml portal/trunk/packaging/tomcat/pkg/pom.xml Log: GTNPORTAL-1769 : Use a module "dependency" to specify the versions of the runtime dependencies not defined in the parent pom GTNPORTAL-1770 : Import dependencies for Tomcat packaging GTNPORTAL-1771 : Import dependencies for Jetty packaging Property changes on: portal/trunk/packaging/dependencies ___________________________________________________________________ Name: svn:ignore + *.iml target Added: portal/trunk/packaging/dependencies/pom.xml =================================================================== --- portal/trunk/packaging/dependencies/pom.xml (rev 0) +++ portal/trunk/packaging/dependencies/pom.xml 2011-02-01 16:38:53 UTC (rev 5837) @@ -0,0 +1,313 @@ +<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> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + <artifactId>exo.portal.packaging.dependencies</artifactId> + <packaging>pom</packaging> + <name>GateIn dependencies</name> + + <dependencyManagement> + + <dependencies> + +  + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>2.2.9.GA</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>2.0.1.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + <version>2.0.5.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.2.6.GA</version> + </dependency> + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossjts</artifactId> + <version>4.6.1.GA</version> + </dependency> + <dependency> + <groupId>jboss.jbossts</groupId> + <artifactId>jbossts-common</artifactId> + <version>4.6.1.GA</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + </dependency> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.13.GA</version> + </dependency> + +  + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.2</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.ccpp</groupId> + <artifactId>ccpp</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>1.0.2.GA</version> + </dependency> + +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.1.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + </dependency> + +  + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.6rc1</version> + </dependency> + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>1.5.3</version> + </dependency> + <dependency> + <groupId>bouncycastle</groupId> + <artifactId>bcmail-jdk14</artifactId> + <version>136</version> + </dependency> + <dependency> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk14</artifactId> + <version>136</version> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>1.3.4</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>1.6.0</version> + </dependency> + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + <dependency> + <groupId>html-parser</groupId> + <artifactId>html-parser</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>2.1.0</version> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-bind</artifactId> + <version>${org.jibx.version}</version> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + <version>${org.jibx.version}</version> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>org.jsecurity</groupId> + <artifactId>jsecurity</artifactId> + <version>0.9.0</version> + </dependency> + <dependency> + <groupId>de.odysseus.juel</groupId> + <artifactId>juel-api</artifactId> + <version>2.1.2</version> + </dependency> + <dependency> + <groupId>de.odysseus.juel</groupId> + <artifactId>juel-impl</artifactId> + <version>2.1.2</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-memory</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-spellchecker</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>3.6</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-ooxml</artifactId> + <version>3.6</version> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-scratchpad</artifactId> + <version>3.6</version> + </dependency> + <dependency> + <groupId>org.apache.portals.bridges</groupId> + <artifactId>portals-bridges-common</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>quartz</groupId> + <artifactId>quartz</artifactId> + <version>1.5.2</version> + </dependency> + <dependency> + <groupId>org.apache.sanselan</groupId> + <artifactId>sanselan</artifactId> + <version>0.97-incubator</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons</groupId> + <artifactId>ws-commons-util</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.3.4.O</version> + </dependency> + <dependency> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.3.1</version> + </dependency> + + </dependencies> + + </dependencyManagement> + + <profiles> + <profile> + <id>pkg-tomcat</id> + <dependencies> + </dependencies> + </profile> + </profiles> + +</project> \ No newline at end of file Modified: portal/trunk/packaging/jetty/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/pom.xml 2011-02-01 16:15:37 UTC (rev 5836) +++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-02-01 16:38:53 UTC (rev 5837) @@ -18,6 +18,18 @@ <jetty.dir>${exo.projects.directory.dependencies}/${exo.projects.app.jetty.version}</jetty.dir> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.dependencies</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies>  @@ -88,42 +100,34 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> - <version>2.2.9.GA</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-spi</artifactId> - <version>2.0.5.GA</version> </dependency> <dependency> <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-core</artifactId> - <version>3.2.6.GA</version> </dependency> <dependency> <groupId>jboss.jbossts</groupId> <artifactId>jbossjts</artifactId> - <version>4.6.1.GA</version> </dependency> <dependency> <groupId>jboss.jbossts</groupId> <artifactId>jbossts-common</artifactId> - <version>4.6.1.GA</version> </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> </dependency> <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> - <version>2.6.13.GA</version> </dependency>  @@ -484,12 +488,10 @@ <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>javax.portlet</groupId> @@ -498,54 +500,44 @@ <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> - <version>1.0.1B</version> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.2</version> </dependency> <dependency> <groupId>javax.resource</groupId> <artifactId>connector-api</artifactId> - <version>1.5</version> </dependency> <dependency> <groupId>javax.ccpp</groupId> <artifactId>ccpp</artifactId> - <version>1.0</version> </dependency>  <dependency> <groupId>org.hibernate</groupId> <artifactId>ejb3-persistence</artifactId> - <version>1.0.2.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> - <version>3.1.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.3.2.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> </dependency>  @@ -560,27 +552,22 @@ <dependency> <groupId>antlr</groupId> <artifactId>antlr</artifactId> - <version>2.7.6rc1</version> </dependency> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> - <version>1.5.3</version> </dependency> <dependency> <groupId>bouncycastle</groupId> <artifactId>bcmail-jdk14</artifactId> - <version>136</version> </dependency> <dependency> <groupId>bouncycastle</groupId> <artifactId>bcprov-jdk14</artifactId> - <version>136</version> </dependency> <dependency> <groupId>caja</groupId> @@ -593,27 +580,22 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2</version> </dependency> <dependency> <groupId>oswego-concurrent</groupId> <artifactId>concurrent</artifactId> - <version>1.3.4</version> </dependency> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>1.6.1</version> </dependency> <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> - <version>1.6.0</version> </dependency> <dependency> <groupId>com.jhlabs</groupId> <artifactId>filters</artifactId> - <version>2.0.235</version> </dependency> <dependency> <groupId>com.google.collections</groupId> @@ -630,7 +612,6 @@ <dependency> <groupId>html-parser</groupId> <artifactId>html-parser</artifactId> - <version>1.6</version> </dependency> <dependency> <groupId>com.ibm.icu</groupId> @@ -639,7 +620,6 @@ <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> - <version>2.1.0</version> </dependency> <dependency> <groupId>net.jcip</groupId> @@ -648,22 +628,18 @@ <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>org.jibx</groupId> <artifactId>jibx-bind</artifactId> - <version>${org.jibx.version}</version> </dependency> <dependency> <groupId>org.jibx</groupId> <artifactId>jibx-run</artifactId> - <version>${org.jibx.version}</version> </dependency> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>1.6</version> </dependency> <dependency> <groupId>rhino</groupId> @@ -672,7 +648,6 @@ <dependency> <groupId>org.jsecurity</groupId> <artifactId>jsecurity</artifactId> - <version>0.9.0</version> </dependency> <dependency> <groupId>org.json</groupId> @@ -681,27 +656,22 @@ <dependency> <groupId>de.odysseus.juel</groupId> <artifactId>juel-api</artifactId> - <version>2.1.2</version> </dependency> <dependency> <groupId>de.odysseus.juel</groupId> <artifactId>juel-impl</artifactId> - <version>2.1.2</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>2.4.1</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-memory</artifactId> - <version>2.4.1</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spellchecker</artifactId> - <version>2.4.1</version> </dependency> <dependency> <groupId>net.sourceforge.nekohtml</groupId> @@ -710,37 +680,30 @@ <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> - <version>1.1.0</version> </dependency> <dependency> <groupId>picocontainer</groupId> <artifactId>picocontainer</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>3.6</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml</artifactId> - <version>3.6</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-scratchpad</artifactId> - <version>3.6</version> </dependency> <dependency> <groupId>org.apache.portals.bridges</groupId> <artifactId>portals-bridges-common</artifactId> - <version>1.0.4</version> </dependency> <dependency> <groupId>quartz</groupId> <artifactId>quartz</artifactId> - <version>1.5.2</version> </dependency> <dependency> <groupId>rome</groupId> @@ -749,12 +712,10 @@ <dependency> <groupId>org.apache.sanselan</groupId> <artifactId>sanselan</artifactId> - <version>0.97-incubator</version> </dependency> <dependency> <groupId>org.apache.ws.commons</groupId> <artifactId>ws-commons-util</artifactId> - <version>1.0.1</version> </dependency> <dependency> <groupId>xerces</groupId> @@ -763,17 +724,14 @@ <dependency> <groupId>org.apache.xmlbeans</groupId> <artifactId>xmlbeans</artifactId> - <version>2.3.0</version> </dependency> <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> - <version>1.1.3.4.O</version> </dependency> <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.3.1</version> </dependency> <dependency> <groupId>net.oauth</groupId> Modified: portal/trunk/packaging/pom.xml =================================================================== --- portal/trunk/packaging/pom.xml 2011-02-01 16:15:37 UTC (rev 5836) +++ portal/trunk/packaging/pom.xml 2011-02-01 16:38:53 UTC (rev 5837) @@ -44,6 +44,7 @@ <profile> <id>pkg-tomcat</id> <modules> + <module>dependencies</module> <module>tomcat</module> <module>reports</module> </modules> Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-02-01 16:15:37 UTC (rev 5836) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-02-01 16:38:53 UTC (rev 5837) @@ -14,6 +14,18 @@ <packaging>pom</packaging> <name>GateIn for Tomcat packaging</name> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.dependencies</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies>  @@ -84,42 +96,34 @@ <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> - <version>2.2.9.GA</version> </dependency> <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> </dependency> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-spi</artifactId> - <version>2.0.5.GA</version> </dependency> <dependency> <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-core</artifactId> - <version>3.2.6.GA</version> </dependency> <dependency> <groupId>jboss.jbossts</groupId> <artifactId>jbossjts</artifactId> - <version>4.6.1.GA</version> </dependency> <dependency> <groupId>jboss.jbossts</groupId> <artifactId>jbossts-common</artifactId> - <version>4.6.1.GA</version> </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.4.GA</version> </dependency> <dependency> <groupId>jgroups</groupId> <artifactId>jgroups</artifactId> - <version>2.6.13.GA</version> </dependency>  @@ -476,12 +480,10 @@ <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>javax.portlet</groupId> @@ -490,54 +492,44 @@ <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> - <version>1.0.1B</version> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.2</version> </dependency> <dependency> <groupId>javax.resource</groupId> <artifactId>connector-api</artifactId> - <version>1.5</version> </dependency> <dependency> <groupId>javax.ccpp</groupId> <artifactId>ccpp</artifactId> - <version>1.0</version> </dependency>  <dependency> <groupId>org.hibernate</groupId> <artifactId>ejb3-persistence</artifactId> - <version>1.0.2.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> - <version>3.1.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.3.2.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> </dependency>  @@ -552,27 +544,22 @@ <dependency> <groupId>antlr</groupId> <artifactId>antlr</artifactId> - <version>2.7.6rc1</version> </dependency> <dependency> <groupId>aopalliance</groupId> <artifactId>aopalliance</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> - <version>1.5.3</version> </dependency> <dependency> <groupId>bouncycastle</groupId> <artifactId>bcmail-jdk14</artifactId> - <version>136</version> </dependency> <dependency> <groupId>bouncycastle</groupId> <artifactId>bcprov-jdk14</artifactId> - <version>136</version> </dependency> <dependency> <groupId>caja</groupId> @@ -585,27 +572,22 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> - <version>2.2</version> </dependency> <dependency> <groupId>oswego-concurrent</groupId> <artifactId>concurrent</artifactId> - <version>1.3.4</version> </dependency> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>1.6.1</version> </dependency> <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> - <version>1.6.0</version> </dependency> <dependency> <groupId>com.jhlabs</groupId> <artifactId>filters</artifactId> - <version>2.0.235</version> </dependency> <dependency> <groupId>com.google.collections</groupId> @@ -622,7 +604,6 @@ <dependency> <groupId>html-parser</groupId> <artifactId>html-parser</artifactId> - <version>1.6</version> </dependency> <dependency> <groupId>com.ibm.icu</groupId> @@ -631,7 +612,6 @@ <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> - <version>2.1.0</version> </dependency> <dependency> <groupId>net.jcip</groupId> @@ -640,22 +620,18 @@ <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> - <version>1.0</version> </dependency> <dependency> <groupId>org.jibx</groupId> <artifactId>jibx-bind</artifactId> - <version>${org.jibx.version}</version> </dependency> <dependency> <groupId>org.jibx</groupId> <artifactId>jibx-run</artifactId> - <version>${org.jibx.version}</version> </dependency> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>1.6</version> </dependency> <dependency> <groupId>rhino</groupId> @@ -664,7 +640,6 @@ <dependency> <groupId>org.jsecurity</groupId> <artifactId>jsecurity</artifactId> - <version>0.9.0</version> </dependency> <dependency> <groupId>org.json</groupId> @@ -673,27 +648,22 @@ <dependency> <groupId>de.odysseus.juel</groupId> <artifactId>juel-api</artifactId> - <version>2.1.2</version> </dependency> <dependency> <groupId>de.odysseus.juel</groupId> <artifactId>juel-impl</artifactId> - <version>2.1.2</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>2.4.1</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-memory</artifactId> - <version>2.4.1</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spellchecker</artifactId> - <version>2.4.1</version> </dependency> <dependency> <groupId>net.sourceforge.nekohtml</groupId> @@ -702,37 +672,30 @@ <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> - <version>1.1.0</version> </dependency> <dependency> <groupId>picocontainer</groupId> <artifactId>picocontainer</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi</artifactId> - <version>3.6</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-ooxml</artifactId> - <version>3.6</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> <artifactId>poi-scratchpad</artifactId> - <version>3.6</version> </dependency> <dependency> <groupId>org.apache.portals.bridges</groupId> <artifactId>portals-bridges-common</artifactId> - <version>1.0.4</version> </dependency> <dependency> <groupId>quartz</groupId> <artifactId>quartz</artifactId> - <version>1.5.2</version> </dependency> <dependency> <groupId>rome</groupId> @@ -741,12 +704,10 @@ <dependency> <groupId>org.apache.sanselan</groupId> <artifactId>sanselan</artifactId> - <version>0.97-incubator</version> </dependency> <dependency> <groupId>org.apache.ws.commons</groupId> <artifactId>ws-commons-util</artifactId> - <version>1.0.1</version> </dependency> <dependency> <groupId>xerces</groupId> @@ -755,17 +716,14 @@ <dependency> <groupId>org.apache.xmlbeans</groupId> <artifactId>xmlbeans</artifactId> - <version>2.3.0</version> </dependency> <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> - <version>1.1.3.4.O</version> </dependency> <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.3.1</version> </dependency> <dependency> <groupId>net.oauth</groupId>

13 years, 11 months

1
0
0 / 0

gatein SVN: r5836 - portal/trunk/packaging/jboss-as6.

by do-not-reply＠jboss.org

Author: mstruk Date: 2011-02-01 11:15:37 -0500 (Tue, 01 Feb 2011) New Revision: 5836 Modified: portal/trunk/packaging/jboss-as6/README.txt Log: GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager - refactored jboss-as6 pom.xml, move 'pack' profile into pom build - added 'pkg-jbossas6' profile with previous packaging kind of behaviour (exo properties) Modified: portal/trunk/packaging/jboss-as6/README.txt =================================================================== --- portal/trunk/packaging/jboss-as6/README.txt 2011-02-01 15:54:13 UTC (rev 5835) +++ portal/trunk/packaging/jboss-as6/README.txt 2011-02-01 16:15:37 UTC (rev 5836) @@ -14,6 +14,8 @@ + + == Usage == @@ -23,14 +25,10 @@ Then go to packaging/jboss-as6 to perform packaging. -There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Ppack), and bundling as a zip (-Pbundle). +There are three profiles that cover dependency download (-Pdownload), packaging as exploded (default), and bundling as a zip (-Pbundle). -For main build use either 'download' or 'pack' profile, but not both, as 'download' also includes 'pack' functionality. -Both of these profiles also automatically perform 'clean' to assure consistent results. +For main build use either 'download' profile or no profile (default). Both of these automatically perform 'clean' to ensure consistent results. -Profile 'pack' is the one active by default. When activating any other profile, the 'pack' profile is automatically turned off, so - it may have to be explicitly activated again if packaging is required (i.e. -Ppack,bundle). - There are two system properties that control where the root directory for JBoss AS servers is located, and what specific JBoss AS directory to use. They are preset to default location: @@ -44,7 +42,7 @@ -== Examples == +== Some Examples == 1) The simplest form uses default location for JBoss AS @@ -53,7 +51,7 @@ This is equivalent to: -mvn clean package -Ppack -Dservers.dir=$GATEIN/portal/trunk/packaging/servers -Djbossas.name=jboss-6.0.0.Final +mvn clean package -Dservers.dir=$GATEIN/portal/trunk/packaging/servers -Djbossas.name=jboss-6.0.0.Final 2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly @@ -65,11 +63,11 @@ mvn -Pdownload -If SERVERS_DIR is not at default location explicitly set it: +If SERVERS_DIR is not at default location, explicitly set it: mvn -Pdownload -Dservers.dir=SERVERS_DIR -You shouldn't set jbossas.name property when using -Pdownload. +There's no need to set 'jbossas.name' property when using -Pdownload (if set, its value should be 'jboss-6.0.0.Final'). 4) Zip bundle may be produced by activating 'bundle' profile @@ -78,8 +76,72 @@ or -mvn -Ppack,bundle +mvn -Pbundle -or just -mvn -Pbundle + + + +== Compatibility with previous packaging (PKG) == + + +The previous packaging uses two different properties to specify 'servers.dir' and 'jbossas.name': + + - exo.projects.directory.dependencies (equivalent to 'servers.dir') + - exo.projects.app.jboss6.version (equivalent to 'jbossas.name') + + +Compatibility mode can be activated by using -Ppkg-jbossas6. + + + + + +== Build integration == + + +Packaging can be run separately from portal build as described before: + +# build portal first +cd $GATEIN/portal/trunk +mvn clean install -DskipTests + +# then package +cd packaging/jboss-as6 +mvn + + +Or it can be run together with the portal build, by using -Ppkg-jbossas6 compatibility mode: + +# build and package all at once +cd $GATEIN/portal/trunk +mvn clean install -Ppkg-jbossas6,download -DskipTests -Dexo.projects.directory.dependencies=$GATEIN/portal/trunk/packaging/servers + +(Notice how we also activate 'download' profile in this example - that's ideal for a new user who's building GateIn for the first time) + + + + + +== Troubleshoot == + + +1) 'Checksum validation failed!' + +When using -Pdownload it may happen that the download is interrupted, and the resulting file corrupt. +The solution is to manually delete the target file from the filesystem, and run 'mvn -Pdownload' again. + +2) 'DIRECTORY does not exist.' when using -Pdownload. + +When using -Pdownload, and specifying -Djbossas.name=NAME at the same time (something you're adviced not to practice), +the download part of the build will completely ignore 'jbossas.name' property, but the packaging part will use it, and look for +JBoss AS instance in the specified directory. +The solution is to not specify -Djbossas.name=NAME at all, or to set its value to 'jboss-6.0.0.Final'. + +3) 'Destination JBossAS directory exists already: DIRECTORY' + +When using -Pdownload the downloaded JBoss AS distribution is unpacked into a local directory. If the directory exists already +the build will abort, to avoid corrupting a possibly carefully prepared specially configured JBoss AS instance. +One solution is to not use -Pdownload in this case since the appropriate JBoss AS is already present. Or, you can move the +directory out of the way, or delete it. +

13 years, 11 months

1
0
0 / 0

gatein SVN: r5835 - portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF.

by do-not-reply＠jboss.org

Author: alain_defrance Date: 2011-02-01 10:54:13 -0500 (Tue, 01 Feb 2011) New Revision: 5835 Modified: portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml Log: fix gadegets/ifr path Modified: portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-02-01 15:37:59 UTC (rev 5834) +++ portal/branches/shindig2/gadgets/server/src/main/webapp/WEB-INF/web.xml 2011-02-01 15:54:13 UTC (rev 5835) @@ -55,7 +55,7 @@ <filter-mapping> <filter-name>authFilter</filter-name> - <url-pattern>/gadgetsifr</url-pattern> + <url-pattern>/gadgets/ifr</url-pattern> </filter-mapping> <filter-mapping> @@ -197,7 +197,7 @@ <servlet-mapping> <servlet-name>xml-to-html</servlet-name> - <url-pattern>/gadgetsifr</url-pattern> + <url-pattern>/gadgets/ifr</url-pattern> </servlet-mapping> <servlet-mapping>

13 years, 11 months

1
0
0 / 0

gatein SVN: r5834 - portal/branches.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-02-01 10:37:59 -0500 (Tue, 01 Feb 2011) New Revision: 5834 Removed: portal/branches/wci/ Log: remove wci work branch

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2011