gatein SVN: r6509 - sandbox/as7_support.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-19 14:23:03 -0400 (Thu, 19 May 2011)
New Revision: 6509
Modified:
sandbox/as7_support/README.txt
Log:
Instructions for building, packaging and running SimplePortal with JBossAS 7
Modified: sandbox/as7_support/README.txt
===================================================================
--- sandbox/as7_support/README.txt 2011-05-19 18:10:21 UTC (rev 6508)
+++ sandbox/as7_support/README.txt 2011-05-19 18:23:03 UTC (rev 6509)
@@ -12,8 +12,10 @@
cd ..
cd pc
-mvn install -P!default,portal -Dmaven.test.skip
+mvn install -P\!default,portal -Dmaven.test.skip
+(on Windows remove the backslash: -P!default,portal)
+
cd jboss-as7-extension
mvn install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=SERVERS_DIR
13 years, 7 months
gatein SVN: r6508 - sandbox/as7_support/pc/jboss-as7-extension/modules.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-19 14:10:21 -0400 (Thu, 19 May 2011)
New Revision: 6508
Modified:
sandbox/as7_support/pc/jboss-as7-extension/modules/build.xml
Log:
Modules generation script bug fix
Modified: sandbox/as7_support/pc/jboss-as7-extension/modules/build.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/modules/build.xml 2011-05-19 17:43:38 UTC (rev 6507)
+++ sandbox/as7_support/pc/jboss-as7-extension/modules/build.xml 2011-05-19 18:10:21 UTC (rev 6508)
@@ -37,11 +37,11 @@
<include name="standalone/**"/>
</fileset>
</copy>
- <chmod perm="+x">
+ <!--chmod perm="+x">
<fileset dir="${output.dir}/bin">
<include name="**/*.sh"/>
</fileset>
- </chmod>
+ </chmod-->
</target>
<target name="make-dirs">
13 years, 7 months
gatein SVN: r6506 - sandbox/as7_support.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-19 13:40:47 -0400 (Thu, 19 May 2011)
New Revision: 6506
Modified:
sandbox/as7_support/README.txt
Log:
Instructions for building, packaging and running SimplePortal with JBossAS 7
Modified: sandbox/as7_support/README.txt
===================================================================
--- sandbox/as7_support/README.txt 2011-05-19 17:38:39 UTC (rev 6505)
+++ sandbox/as7_support/README.txt 2011-05-19 17:40:47 UTC (rev 6506)
@@ -2,6 +2,11 @@
To deploy SimplePortal to JBoss AS7 follow these steps:
+
+svn co https://svn.jboss.org/repos/gatein/sandbox/as7_support
+
+cd as7_support
+
cd wci
mvn install -Dmaven.test.skip
13 years, 7 months
gatein SVN: r6505 - in sandbox/as7_support: pc/jboss-as7-extension and 1 other directory.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-19 13:38:39 -0400 (Thu, 19 May 2011)
New Revision: 6505
Added:
sandbox/as7_support/README.txt
Modified:
sandbox/as7_support/pc/jboss-as7-extension/pom.xml
Log:
Instructions for building, packaging and running SimplePortal with JBossAS 7
Added: sandbox/as7_support/README.txt
===================================================================
--- sandbox/as7_support/README.txt (rev 0)
+++ sandbox/as7_support/README.txt 2011-05-19 17:38:39 UTC (rev 6505)
@@ -0,0 +1,27 @@
+This branch is for the development of JBoss AS7 support
+
+To deploy SimplePortal to JBoss AS7 follow these steps:
+
+cd wci
+mvn install -Dmaven.test.skip
+
+cd ..
+cd pc
+mvn install -P!default,portal -Dmaven.test.skip
+
+cd jboss-as7-extension
+mvn install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=SERVERS_DIR
+
+(the previous command automatically downloads jboss-7.0.0.Beta3 build and unpacks it into SERVERS_DIR. If you already have this JBoss AS7 build in SERVERS_DIR you can omit 'download' profile)
+
+cd target
+cd jboss-7.0.0.Beta3
+cd bin
+./standalone.sh (or just 'standalone' on Windows)
+
+You should see exactly one stacktrace deliberately thrown by FailOnInitPortlet.
+
+Goto: http://localhost:8080/simple-portal
+
+Click around, and see how everything that should be working is working, and how what shouldn't be working isn't working :)
+
Modified: sandbox/as7_support/pc/jboss-as7-extension/pom.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/pom.xml 2011-05-19 17:01:09 UTC (rev 6504)
+++ sandbox/as7_support/pc/jboss-as7-extension/pom.xml 2011-05-19 17:38:39 UTC (rev 6505)
@@ -45,9 +45,25 @@
</dependencies>
</dependencyManagement>
- <modules>
- <module>extension</module>
- <module>modules</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>modules</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>extension</module>
+ <module>modules</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>pkg-jbossas7</id>
+ <modules>
+ <module>extension</module>
+ <module>modules</module>
+ <module>pkg</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
13 years, 7 months
gatein SVN: r6504 - in sandbox/as7_support/pc/jboss-as7-extension: pkg and 13 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-19 13:01:09 -0400 (Thu, 19 May 2011)
New Revision: 6504
Added:
sandbox/as7_support/pc/jboss-as7-extension/pkg/
sandbox/as7_support/pc/jboss-as7-extension/pkg/download-jboss.xml
sandbox/as7_support/pc/jboss-as7-extension/pkg/package.xml
sandbox/as7_support/pc/jboss-as7-extension/pkg/pom.xml
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/org/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/org/jboss/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/org/jboss/as/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/org/jboss/as/web/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/standalone/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/standalone/configuration/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/standalone/deployments/
sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/standalone/deployments/simple-portal.ear.dodeploy
Modified:
sandbox/as7_support/pc/jboss-as7-extension/pom.xml
Log:
Packaging for JBoss AS7
Added: sandbox/as7_support/pc/jboss-as7-extension/pkg/download-jboss.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/pkg/download-jboss.xml (rev 0)
+++ sandbox/as7_support/pc/jboss-as7-extension/pkg/download-jboss.xml 2011-05-19 17:01:09 UTC (rev 6504)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="download-jboss" xmlns:mvn="http://maven.apache.org/POM/4.0.0">
+
+ <target name="download-jboss">
+
+ <!-- Fetch jbossas .zip -->
+ <get dest="${dest}" skipexisting="true">
+ <url url="${url}"/>
+ </get>
+
+ <!-- Fetch .sha1 file -->
+ <get dest="${dest}.sha1" skipexisting="true">
+ <url url="${url}.sha1"/>
+ </get>
+
+ <!-- Validate checksum -->
+ <local name="checksum.matches"/>
+ <local name="checksum.matches.fail"/>
+ <checksum file="${dest}" algorithm="sha" fileext=".sha1"
+ verifyproperty="checksum.matches"/>
+ <condition property="checksum.matches.fail">
+ <equals arg1="${checksum.matches}" arg2="false"/>
+ </condition>
+ <fail if="checksum.matches.fail">Checksum validation failed! (for: ${dest})</fail>
+
+ </target>
+</project>
\ No newline at end of file
Added: sandbox/as7_support/pc/jboss-as7-extension/pkg/package.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/pkg/package.xml (rev 0)
+++ sandbox/as7_support/pc/jboss-as7-extension/pkg/package.xml 2011-05-19 17:01:09 UTC (rev 6504)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="package" xmlns:mvn="http://maven.apache.org/POM/4.0.0">
+
+ <target name="package">
+
+ <echo>Using JBoss AS at: ${jbossas.dir}</echo>
+
+ <!-- Copy jboss -->
+ <copy todir="${jbossas.target.dir}" preservelastmodified="true">
+ <fileset dir="${jbossas.dir}"/>
+ </copy>
+
+ <!-- Copy configuration non-xml first -->
+ <!--copy todir="${jbossas.target.dir}" preservelastmodified="true" overwrite="true">
+ <fileset dir="${maven.project.basedir}/src/main/resources/jboss">
+ <exclude name="**/*.xml" />
+ </fileset>
+ </copy-->
+
+ <!-- Copy configuration files -->
+ <copy todir="${jbossas.target.dir}" preservelastmodified="true" overwrite="true">
+ <fileset dir="${maven.project.basedir}/src/main/resources/jboss" />
+ </copy>
+
+ <!-- Copy modules -->
+ <copy todir="${jbossas.target.dir}/modules" preservelastmodified="true" overwrite="true">
+ <fileset dir="${maven.project.basedir}/../modules/target/${jbossas.name}/modules" />
+ </copy>
+
+ <!-- Copy simple-portal -->
+ <copy todir="${jbossas.target.dir}/standalone/deployments/simple-portal.ear" preservelastmodified="true" overwrite="true">
+ <fileset dir="${maven.project.basedir}/../../portal/target/simple-portal-jboss7-ear/simple-portal.ear" />
+ </copy>
+
+ <!-- File permissions -->
+ <!-- Excluded due to ARG_MAX limitation on Mac OS X -->
+ <!--chmod perm="0644" type="file" dir="${jbossas.target.dir}" excludes="**/*.sh"/-->
+ <chmod perm="0755" type="file" dir="${jbossas.target.dir}" includes="**/*.sh"/>
+
+ </target>
+</project>
\ No newline at end of file
Added: sandbox/as7_support/pc/jboss-as7-extension/pkg/pom.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/pkg/pom.xml (rev 0)
+++ sandbox/as7_support/pc/jboss-as7-extension/pkg/pom.xml 2011-05-19 17:01:09 UTC (rev 6504)
@@ -0,0 +1,305 @@
+<?xml version="1.0"?>
+<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.gatein.pc</groupId>
+ <artifactId>jboss-as7-extension</artifactId>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>gatein-jboss-as7-pkg</artifactId>
+ <packaging>pom</packaging>
+
+ <name>SimplePortal for JBoss AS 7 packaging</name>
+
+ <properties>
+ <jbossas.version>7.0.0.Beta3</jbossas.version>
+ <jbossas.dist.version>${jbossas.version}</jbossas.dist.version>
+ <servers.dir>${project.basedir}/servers</servers.dir>
+ <jbossas.path>${servers.dir}</jbossas.path>
+ <jbossas.name>jboss-${jbossas.version}</jbossas.name>
+ <jbossas.dir>${jbossas.path}/${jbossas.name}</jbossas.dir>
+ <gatein.working.dir>${project.build.directory}/${jbossas.name}</gatein.working.dir>
+ <jbossas.target.dir>${gatein.working.dir}</jbossas.target.dir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-jboss-as7</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>gatein-jboss-as7-modules</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-portal</artifactId>
+ </dependency>
+ </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>pkg-jbossas7</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <properties>
+ <exo.projects.app.jboss7.version>jboss-7.0.0.Beta3</exo.projects.app.jboss7.version>
+ <servers.dir>${exo.projects.directory.dependencies}</servers.dir>
+ <jbossas.name>${exo.projects.app.jboss7.version}</jbossas.name>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>check-jboss-legacy-environment-dependencies-dir</id>
+ <goals>
+ <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>
+ <execution>
+ <id>check-jboss-legacy-environment-jboss-name</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>exo.projects.app.jboss7.version</property>
+ <message>"
+You must define the property 'exo.projects.app.jboss7.version'
+to specify the name of the directory where JBoss AS is stored.
+"
+ </message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>check-jboss-dir-exists</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireFilesExist>
+ <files>
+ <file>${exo.projects.directory.dependencies}/${exo.projects.app.jboss7.version}/
+ </file>
+ </files>
+ <message>"
+The following JBoss AS directory doesn't exist :
+ ${exo.projects.directory.dependencies}/${exo.projects.app.jboss7.version}
+
+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.jboss7.version=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>
+ <execution>
+ <id>check-jboss-environment-ready</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>download</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <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>
+ <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>
+ <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-build-${jbossas.dist.version}.zip"/>
+
+ <!-- Autocreate servers.dir if necessary -->
+ <mkdir dir="${jbossas.path}"/>
+
+ <!-- Download JBossAS unless already downloaded -->
+ <ant antfile="${project.basedir}/download-jboss.xml">
+ <target name="download-jboss"/>
+ <property name="url"
+ value="https://repository.jboss.org/nexus/content/groups/public-jboss/org/jboss/..."/>
+ <property name="dest" value="${jbossas.zip}"/>
+ </ant>
+
+ <!-- Extract downloaded JBossAS to servers dir -->
+ <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>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Added: sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml (rev 0)
+++ sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/modules/org/jboss/as/web/main/module.xml 2011-05-19 17:01:09 UTC (rev 6504)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.as.web">
+
+ <resources>
+ <resource-root path="jboss-as-web-7.0.0.Beta3.jar"/>
+ <resource-root path="jasper-jdt-7.0.0.Beta8.jar"/>
+ <resource-root path="jbossweb-7.0.0.Beta11.jar"/>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="com.sun.jsf-impl"/>
+ <module name="javax.annotation.api"/>
+ <module name="javax.api"/>
+ <module name="javax.faces.api"/>
+ <module name="javax.servlet.api"/>
+ <module name="javax.servlet.jsp.api"/>
+ <module name="org.jboss.jandex"/>
+ <module name="org.jboss.staxmapper"/>
+ <module name="org.jboss.as.controller"/>
+ <module name="org.jboss.as.ee"/>
+ <module name="org.jboss.as.naming"/>
+ <module name="org.jboss.as.server"/>
+ <module name="org.jboss.invocation"/>
+ <module name="org.jboss.metadata"/>
+ <module name="org.jboss.modules"/>
+ <module name="org.jboss.msc"/>
+ <module name="org.jboss.threads"/>
+ <module name="org.jboss.vfs"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.jboss.common-core"/>
+ <module name="org.picketbox"/>
+ <module name="org.gatein.wci"/>
+ </dependencies>
+</module>
Added: sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml (rev 0)
+++ sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2011-05-19 17:01:09 UTC (rev 6504)
@@ -0,0 +1,346 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<server name="example" xmlns="urn:jboss:domain:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:domain:1.0 jboss_7_0.xsd urn:jboss:domain:arquillian:1.0 jboss-arquillian.xsd urn:jboss:domain:connector:1.0 jboss-connector.xsd urn:jboss:domain:datasources:1.0 jboss-datasources.xsd urn:jboss:domain:ejb3:1.0 jboss-ejb3.xsd urn:jboss:domain:ee:1.0 jboss-ee.xsd urn:jboss:domain:jaxrs:1.0 jboss-jaxrs.xsd urn:jboss:domain:jmx:1.0 jboss-jmx.xsd urn:jboss:domain:jpa:1.0 jboss-jpa.xsd urn:jboss:domain:messaging:1.0 jboss-messaging.xsd urn:jboss:domain:naming:1.0 jboss-naming.xsd urn:jboss:domain:osgi:1.0 jboss-osgi.xsd urn:jboss:domain:remoting:1.0 jboss-remoting.xsd urn:jboss:domain:resourceadapters:1.0 jboss-resource-adapters.xsd urn:jboss:domain:sar:1.0 jboss-sar.xsd urn:jboss:domain:threads:1.0 jboss-threads.xsd urn:jboss:domain:transactions:1.0 jboss-txn.xsd urn:jboss:domain:web:1.0 jboss-web.xsd urn:jboss:domain:deployment-scanner:1.0 jbos!
s-deployment-scanner.xsd urn:jboss:domain:security:1.0 jboss-security.xsd urn:jboss:domain:webservices:1.0 jboss-webservices.xsd urn:jboss:domain:weld:1.0 jboss-weld.xsd urn:jboss:domain:gatein:1.0 jboss-gatein.xsd">
+ <extensions>
+ <extension module="org.jboss.as.arquillian.service"/>
+ <extension module="org.jboss.as.connector"/>
+ <extension module="org.jboss.as.deployment-scanner"/>
+ <extension module="org.jboss.as.ee"/>
+ <extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.jaxrs"/>
+ <extension module="org.jboss.as.jmx"/>
+ <extension module="org.jboss.as.jpa"/>
+ <extension module="org.jboss.as.logging"/>
+ <extension module="org.jboss.as.messaging"/>
+ <extension module="org.jboss.as.naming"/>
+ <extension module="org.jboss.as.osgi"/>
+ <extension module="org.jboss.as.remoting"/>
+ <extension module="org.jboss.as.sar"/>
+ <extension module="org.jboss.as.security"/>
+ <extension module="org.jboss.as.threads"/>
+ <extension module="org.jboss.as.transactions"/>
+ <extension module="org.jboss.as.web"/>
+ <extension module="org.jboss.as.webservices"/>
+ <extension module="org.jboss.as.weld"/>
+ <extension module="org.gatein"/>
+ </extensions>
+ <paths>
+ <path name="absolute" path="tmp"/>
+ <path name="relative" path="relative" relative-to="absolute"/>
+ </paths>
+ <management-interfaces>
+ <native-interface interface="default" port="9999"/>
+ <http-interface interface="default" port="9990"/>
+ </management-interfaces>
+ <profile name="undefined">
+ <subsystem xmlns="urn:jboss:domain:logging:1.0">
+ <console-handler name="CONSOLE" autoflush="true">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+ <periodic-rotating-file-handler name="FILE" autoflush="true">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="server.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ </periodic-rotating-file-handler>
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="org.apache.tomcat.util.modeler">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.0">
+ <bounded-queue-thread-pool name="jca-short-running" blocking="true" allow-core-timeout="false">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="SECONDS"/>
+ </bounded-queue-thread-pool>
+ <bounded-queue-thread-pool name="jca-long-running" blocking="true" allow-core-timeout="false">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="SECONDS"/>
+ </bounded-queue-thread-pool>
+ <bounded-queue-thread-pool name="ejb3-async" blocking="true" allow-core-timeout="false">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="SECONDS"/>
+ </bounded-queue-thread-pool>
+ <scheduled-thread-pool name="remoting">
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="SECONDS"/>
+ </scheduled-thread-pool>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:arquillian:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.0">
+ <security-domains>
+ <security-domain name="other">
+ <authentication>
+ <login-module code="UsersRoles" flag="required"/>
+ </authentication>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:remoting:1.0" thread-pool="remoting"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.0">
+ <jmx-connector server-binding="jmx-connector-server" registry-binding="jmx-connector-registry"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:transactions:1.0">
+ <core-environment socket-binding="txn-socket-process-id"/>
+ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+ <coordinator-environment/>
+ <object-store/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:connector:1.0">
+ <archive-validation enabled="false"/>
+ <bean-validation enabled="false"/>
+ <default-workmanager short-running-thread-pool="jca-short-running" long-running-thread-pool="jca-long-running"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+ <datasources>
+ <datasource jndi-name="java:/H2DS" pool-name="H2DS" enabled="true" use-java-context="true">
+ <connection-url>
+ jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
+ </connection-url>
+ <driver-class>
+ org.h2.Driver
+ </driver-class>
+ <driver>
+ org.h2.Driver#1.2
+ </driver>
+ <pool>
+ <prefill>
+ true
+ </prefill>
+ <use-strict-min>
+ false
+ </use-strict-min>
+ </pool>
+ <security>
+ <user-name>
+ sa
+ </user-name>
+ <password>
+ sa
+ </password>
+ </security>
+ <validation>
+ <validate-on-match>
+ false
+ </validate-on-match>
+ <background-validation>
+ false
+ </background-validation>
+ <useFastFail>
+ false
+ </useFastFail>
+ </validation>
+ <statement/>
+ </datasource>
+ </datasources>
+ <drivers>
+ <driver module="com.h2database.h2"/>
+ </drivers>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:resourceadapters:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.0" activation="lazy">
+ <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
+ <property name="manager.root">
+ jboss-osgi
+ </property>
+ </configuration>
+ <properties>
+ <property name="org.jboss.osgi.system.modules">
+ org.apache.log4j,
+ org.jboss.as.osgi,
+ </property>
+ <property name="org.osgi.framework.system.packages.extra">
+ org.apache.log4j;version=1.2,
+ org.jboss.as.osgi.service;version=7.0,
+ org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.util;version=1.0,
+ org.jboss.osgi.testing;version=1.0,
+ </property>
+ </properties>
+ <modules>
+ <module identifier="org.jboss.as.arquillian.aggregate"/>
+ <module identifier="org.jboss.logging"/>
+ <module identifier="org.apache.aries.jmx" start="true"/>
+ <module identifier="org.apache.aries.util"/>
+ <module identifier="org.apache.felix.configadmin" start="true"/>
+ <module identifier="org.jboss.as.osgi.configadmin" start="true"/>
+ <module identifier="org.jboss.osgi.common" start="true"/>
+ <module identifier="org.jboss.osgi.jmx" start="true"/>
+ <module identifier="org.osgi.compendium"/>
+ </modules>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:messaging:1.0">
+ <acceptors>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ <netty-acceptor name="netty" socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ <param key="direct-deliver" value="false"/>
+ </netty-acceptor>
+ </acceptors>
+ <address-settings>
+ <address-setting match="#">
+ <dead-letter-address>
+ jms.queue.DLQ
+ </dead-letter-address>
+ <expiry-address>
+ jms.queue.ExpiryQueue
+ </expiry-address>
+ <redelivery-delay>
+ 0
+ </redelivery-delay>
+ <max-size-bytes>
+ 10485760
+ </max-size-bytes>
+ <message-counter-history-day-limit>
+ 10
+ </message-counter-history-day-limit>
+ <address-full-policy>
+ BLOCK
+ </address-full-policy>
+ </address-setting>
+ </address-settings>
+ <connectors>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ <netty-connector name="netty" socket-binding="messaging"/>
+ <netty-connector name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ </netty-connector>
+ </connectors>
+ <journal-min-files>
+ 2
+ </journal-min-files>
+ <journal-type>
+ NIO
+ </journal-type>
+ <journal-file-size>
+ 102400
+ </journal-file-size>
+ <persistence-enabled>
+ false
+ </persistence-enabled>
+ <security-settings>
+ <security-setting match="#">
+ <permission type="send" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ </security-setting>
+ </security-settings>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:messaging:jms:1.0">
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="in-vm" backup-connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="java:/ConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <connection-factory name="RemoteConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty" backup-connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="RemoteConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <queue name="testQueue">
+ <entry name="queue/test"/>
+ </queue>
+ <topic name="testTopic">
+ <entry name="topic/test"/>
+ </topic>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:web:1.0">
+ <connector name="http" protocol="HTTP/1.1" socket-binding="http" scheme="http"/>
+ <virtual-server name="localhost">
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
+ <deployment-scanner name="default" path="deployments" scan-interval="5000" relative-to="jboss.server.base.dir"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.0">
+ <configuration>
+ <webServiceHost>
+ localhost
+ </webServiceHost>
+ <modifySOAPAddress>
+ true
+ </modifySOAPAddress>
+ </configuration>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:gatein:1.0"/>
+ </profile>
+ <interfaces>
+ <interface name="default">
+ <inet-address value="127.0.0.1"/>
+ </interface>
+ <interface name="any">
+ <any-address/>
+ </interface>
+ <interface name="complex">
+ <any>
+ <subnet-match value="192.168.0.0/16"/>
+ <public-address/>
+ </any>
+ <not>
+ <site-local-address/>
+ </not>
+ <up/>
+ <multicast/>
+ </interface>
+ </interfaces>
+ <socket-binding-group name="standard-sockets" default-interface="default">
+ <socket-binding name="jndi" port="1099"/>
+ <socket-binding name="jmx-connector-registry" port="1090"/>
+ <socket-binding name="jmx-connector-server" port="1091"/>
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8447"/>
+ <socket-binding name="osgi-http" port="8090"/>
+ <socket-binding name="remoting" port="4447"/>
+ <socket-binding name="txn-recovery-environment" port="4712"/>
+ <socket-binding name="txn-status-manager" port="4713"/>
+ <socket-binding name="txn-socket-process-id" port="4714"/>
+ <socket-binding name="messaging" port="5445"/>
+ <socket-binding name="messaging-throughput" port="5455"/>
+ </socket-binding-group>
+ <system-properties>
+ <property name="foo" value="bar"/>
+ <property name="key" value="value"/>
+ </system-properties>
+ <deployments>
+ <deployment name="simple-portal.ear" runtime-name="simple-portal.ear" sha1="1682d34c7e562db7d6ad53624f9e41fbb0398e13"/>
+ </deployments>
+</server>
\ No newline at end of file
Added: sandbox/as7_support/pc/jboss-as7-extension/pkg/src/main/resources/jboss/standalone/deployments/simple-portal.ear.dodeploy
===================================================================
Modified: sandbox/as7_support/pc/jboss-as7-extension/pom.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/pom.xml 2011-05-19 15:11:35 UTC (rev 6503)
+++ sandbox/as7_support/pc/jboss-as7-extension/pom.xml 2011-05-19 17:01:09 UTC (rev 6504)
@@ -26,6 +26,16 @@
<artifactId>gatein-jboss-as7</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>gatein-jboss-as7-modules</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-portal</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.jboss</groupId>
13 years, 7 months
gatein SVN: r6503 - sandbox/as7_support/pc/portal/src/main/resources/jboss7/META-INF.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-19 11:11:35 -0400 (Thu, 19 May 2011)
New Revision: 6503
Removed:
sandbox/as7_support/pc/portal/src/main/resources/jboss7/META-INF/MANIFEST.MF
Log:
Removed unneeded manifest - as I couldn't get AS7 integration working without extensions, and this file was to place dependency modules on classpath to achieve that
Deleted: sandbox/as7_support/pc/portal/src/main/resources/jboss7/META-INF/MANIFEST.MF
===================================================================
--- sandbox/as7_support/pc/portal/src/main/resources/jboss7/META-INF/MANIFEST.MF 2011-05-19 15:08:22 UTC (rev 6502)
+++ sandbox/as7_support/pc/portal/src/main/resources/jboss7/META-INF/MANIFEST.MF 2011-05-19 15:11:35 UTC (rev 6503)
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Dependencies: org.jboss.as.web,org.slf4j
13 years, 7 months
gatein SVN: r6502 - sandbox/as7_support/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-19 11:08:22 -0400 (Thu, 19 May 2011)
New Revision: 6502
Removed:
sandbox/as7_support/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7WebLifecycleListener.java
Log:
Removed unneeded class - would be a replacement for JB7ContainerServlet but got that one working in the end
Deleted: sandbox/as7_support/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7WebLifecycleListener.java
===================================================================
--- sandbox/as7_support/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7WebLifecycleListener.java 2011-05-19 14:59:34 UTC (rev 6501)
+++ sandbox/as7_support/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7WebLifecycleListener.java 2011-05-19 15:08:22 UTC (rev 6502)
@@ -1,104 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2011, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.gatein.wci.jboss;
-
-import org.apache.catalina.Container;
-import org.apache.catalina.Engine;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleListener;
-import org.gatein.common.logging.Logger;
-import org.gatein.common.logging.LoggerFactory;
-
-/**
- * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
- */
-public class JB7WebLifecycleListener implements LifecycleListener
-{
- private static final Logger log = LoggerFactory.getLogger(JB7WebLifecycleListener.class);
-
- /** . */
- private Container wrapper;
-
- /** . */
- private JB7ServletContainerContext containerContext;
-
- /** . */
- private boolean started;
-
- private boolean crossContextLogout = true;
-
-
- public void lifecycleEvent(LifecycleEvent lifecycleEvent)
- {
- log(lifecycleEvent);
- if ("complete-config".equals(lifecycleEvent.getType()) && !started)
- {
- wrapper = (Container) lifecycleEvent.getSource();
- start();
- }
- else if (Lifecycle.BEFORE_STOP_EVENT.equals(lifecycleEvent.getType()) && started)
- {
- wrapper = null;
- stop();
- }
- }
-
- private void start()
- {
- started = true;
- Container container = wrapper;
- while (container.getParent() != null)
- {
- container = container.getParent();
- if (container instanceof Engine)
- {
- Engine engine = (Engine) container;
- containerContext = new JB7ServletContainerContext(engine);
- containerContext.setCrossContextLogout(crossContextLogout);
- containerContext.start();
- break;
- }
- }
- }
-
- private void stop()
- {
- started = false;
- if (containerContext != null)
- {
- containerContext.stop();
- containerContext = null;
- }
- }
-
- public void setCrossContextLogout(String val)
- {
- crossContextLogout = Boolean.valueOf(val);
- }
-
- private void log(LifecycleEvent lifecycleEvent)
- {
- System.out.println(lifecycleEvent);
- }
-}
13 years, 7 months
gatein SVN: r6501 - sandbox/as7_support/wci/wci/src/main/java/org/gatein/wci/impl.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-19 10:59:34 -0400 (Thu, 19 May 2011)
New Revision: 6501
Modified:
sandbox/as7_support/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
Log:
Fix for deadlocks upon concurrent Context shutdowns - JBoss AS7 starts up and shuts down .wars concurrently
Modified: sandbox/as7_support/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
===================================================================
--- sandbox/as7_support/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2011-05-19 14:57:33 UTC (rev 6500)
+++ sandbox/as7_support/wci/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2011-05-19 14:59:34 UTC (rev 6501)
@@ -354,27 +354,37 @@
{
throw new IllegalStateException("Disposed registration");
}
- synchronized (container.lock)
+
+ if (webAppId == null)
{
- if (webAppId == null)
- {
- throw new IllegalArgumentException("No null web app id accepted");
- }
+ throw new IllegalArgumentException("No null web app id accepted");
+ }
- //
- WebAppImpl webApp = container.webAppMap.remove(webAppId);
- if (webApp != null)
+ WebAppImpl webApp = container.webAppMap.get(webAppId);
+ if (webApp == null)
+ {
+ log.debug("Web application " + webAppId + " was not registered");
+ return false;
+ }
+ // lock context before locking container to prevent deadlocks
+ synchronized (webApp.context)
+ {
+ synchronized (container.lock)
{
- log.debug("Web application " + webAppId + " cleanup");
- container.fireEvent(new WebAppLifeCycleEvent(webApp, WebAppLifeCycleEvent.REMOVED));
- webApp.context.stop();
- return true;
+ webApp = container.webAppMap.remove(webAppId);
+ if (webApp != null)
+ {
+ log.debug("Web application " + webAppId + " cleanup");
+ container.fireEvent(new WebAppLifeCycleEvent(webApp, WebAppLifeCycleEvent.REMOVED));
+ webApp.context.stop();
+ return true;
+ }
+ else
+ {
+ log.debug("Web application " + webAppId + " was not registered");
+ return false;
+ }
}
- else
- {
- log.debug("Web application " + webAppId + " was not registered");
- return false;
- }
}
}
13 years, 7 months
gatein SVN: r6500 - sandbox/as7_support/wci.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-19 10:57:33 -0400 (Thu, 19 May 2011)
New Revision: 6500
Modified:
sandbox/as7_support/wci/pom.xml
Log:
Add jboss/jboss7 module to parent pom
Modified: sandbox/as7_support/wci/pom.xml
===================================================================
--- sandbox/as7_support/wci/pom.xml 2011-05-19 14:56:12 UTC (rev 6499)
+++ sandbox/as7_support/wci/pom.xml 2011-05-19 14:57:33 UTC (rev 6500)
@@ -149,13 +149,14 @@
</dependency>
</dependencies>
</dependencyManagement>
-
+
<modules>
<module>wci</module>
<module>exo</module>
<module>tomcat/tomcat6</module>
<module>tomcat/tomcat7</module>
<module>jboss/jboss6</module>
+ <module>jboss/jboss7</module>
<module>jetty</module>
<module>test</module>
</modules>
13 years, 7 months