gatein SVN: r5798 - portal/trunk/packaging.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-01-20 11:04:24 -0500 (Thu, 20 Jan 2011)
New Revision: 5798
Modified:
portal/trunk/packaging/pom.xml
Log:
Adding pkg-jbossas5 and pkg-jbossas6 profiles
Modified: portal/trunk/packaging/pom.xml
===================================================================
--- portal/trunk/packaging/pom.xml 2011-01-20 12:34:37 UTC (rev 5797)
+++ portal/trunk/packaging/pom.xml 2011-01-20 16:04:24 UTC (rev 5798)
@@ -58,5 +58,20 @@
<module>reports</module>
</modules>
</profile>
+ <profile>
+ <id>pkg-jbossas6</id>
+ <modules>
+ <module>jboss-as6</module>
+ <module>reports</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>pkg-jbossas7</id>
+ <modules>
+ <module>jboss-as7</module>
+ <module>reports</module>
+ </modules>
+ </profile>
+
</profiles>
</project>
13 years, 3 months
- 1
- 0
gatein SVN: r5797 - in portal/trunk/packaging: jboss-as5/pkg and 2 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-01-20 07:34:37 -0500 (Thu, 20 Jan 2011)
New Revision: 5797
Modified:
portal/trunk/packaging/jboss-as5/README.txt
portal/trunk/packaging/jboss-as5/pkg/pom.xml
portal/trunk/packaging/jboss-as6/README.txt
portal/trunk/packaging/jboss-as6/pkg/pom.xml
Log:
GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager
- moved default servers.dir to packaging/servers
- renamed 'default' profile to 'pack' to avoid collisions
Modified: portal/trunk/packaging/jboss-as5/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as5/README.txt 2011-01-20 08:35:09 UTC (rev 5796)
+++ portal/trunk/packaging/jboss-as5/README.txt 2011-01-20 12:34:37 UTC (rev 5797)
@@ -25,21 +25,21 @@
Then go to packaging/jboss-as5 to perform packaging.
-There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Pdefault), and bundling as a zip (-Pbundle).
+There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Ppack), and bundling as a zip (-Pbundle).
-For main build use either 'download' or 'default' profile, but not both, as 'download' also includes 'default' functionality.
+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.
-Profile 'default' is the one active by default. When activating any other profile, the 'default' profile is automatically turned off, so
- it may have to be explicitly activated again if packaging is required (i.e. -Pdefault,bundle).
+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:
-servers.dir=${project.basedir}/../../pkg/servers
+servers.dir=${project.basedir}/../../servers
jbossas.name=jboss-5.1.0.GA
-Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-5.1.0.GA as the location where JBoss AS is found.
+Together they resolve into $GATEIN/portal/trunk/packaging/servers/jboss-5.1.0.GA as the location where JBoss AS is found.
The default goal is set to 'package' so there is no need to specify it.
@@ -55,7 +55,7 @@
This is equivalent to:
-mvn clean package -Pdefault -Dservers.dir=$GATEIN/portal/trunk/packaging/pkg/servers -Djbossas.name=jboss-5.1.0.GA
+mvn clean package -Ppack -Dservers.dir=$GATEIN/portal/trunk/packaging/servers -Djbossas.name=jboss-5.1.0.GA
2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly
@@ -80,7 +80,7 @@
or
-mvn -Pdefault,bundle
+mvn -Ppack,bundle
or just
Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-20 08:35:09 UTC (rev 5796)
+++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-20 12:34:37 UTC (rev 5797)
@@ -19,7 +19,7 @@
<properties>
<jbossas.version>5.1.0.GA</jbossas.version>
<jbossas.dist.version>5.1.0.GA-jdk6</jbossas.dist.version>
- <servers.dir>${project.basedir}/../../pkg/servers</servers.dir>
+ <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>
@@ -941,6 +941,9 @@
<target>
<property name="jbossas.zip" value="${jbossas.path}/jboss-${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"/>
@@ -972,7 +975,7 @@
</profile>
<profile>
- <id>default</id>
+ <id>pack</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -1007,7 +1010,11 @@
<file>${jbossas.path}/${jbossas.name}/</file>
</files>
<message>"The following JBoss AS directory doesn't exist :
- ${jbossas.path}/${jbossas.name}"
+ ${jbossas.path}/${jbossas.name}
+
+Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location.
+You can also use -Pdownload to automatically provide JBoss AS instance.
+"
</message>
</requireFilesExist>
</rules>
Modified: portal/trunk/packaging/jboss-as6/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as6/README.txt 2011-01-20 08:35:09 UTC (rev 5796)
+++ portal/trunk/packaging/jboss-as6/README.txt 2011-01-20 12:34:37 UTC (rev 5797)
@@ -23,21 +23,21 @@
Then go to packaging/jboss-as6 to perform packaging.
-There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Pdefault), and bundling as a zip (-Pbundle).
+There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Ppack), and bundling as a zip (-Pbundle).
-For main build use either 'download' or 'default' profile, but not both, as 'download' also includes 'default' functionality.
+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.
-Profile 'default' is the one active by default. When activating any other profile, the 'default' profile is automatically turned off, so
- it may have to be explicitly activated again if packaging is required (i.e. -Pdefault,bundle).
+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:
-servers.dir=${project.basedir}/../../pkg/servers
+servers.dir=${project.basedir}/../../servers
jbossas.name=jboss-6.0.0.Final
-Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-6.0.0.Final as the location where JBoss AS is found.
+Together they resolve into $GATEIN/portal/trunk/packaging/servers/jboss-6.0.0.Final as the location where JBoss AS is found.
The default goal is set to 'package' so there is no need to specify it.
@@ -53,7 +53,7 @@
This is equivalent to:
-mvn clean package -Pdefault -Dservers.dir=$GATEIN/portal/trunk/packaging/pkg/servers -Djbossas.name=jboss-6.0.0.Final
+mvn clean package -Ppack -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
@@ -78,7 +78,7 @@
or
-mvn -Pdefault,bundle
+mvn -Ppack,bundle
or just
Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-20 08:35:09 UTC (rev 5796)
+++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-20 12:34:37 UTC (rev 5797)
@@ -19,7 +19,7 @@
<properties>
<jbossas.version>6.0.0.Final</jbossas.version>
<jbossas.dist.version>${jbossas.version}</jbossas.dist.version>
- <servers.dir>${project.basedir}/../../pkg/servers</servers.dir>
+ <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>
@@ -935,6 +935,9 @@
<property name="jbossas.zip"
value="${jbossas.path}/jboss-as-distribution-${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"/>
@@ -945,8 +948,9 @@
<available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/>
- <fail message="Destination JBossAS directory exists already: ${jbossas.dir} (Won't overwrite!)"
- if="jbossas.dir.exists"/>
+ <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>
<!-- Extract downloaded JBossAS to servers dir -->
<unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/>
@@ -966,7 +970,7 @@
</profile>
<profile>
- <id>default</id>
+ <id>pack</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -1001,7 +1005,11 @@
<file>${jbossas.path}/${jbossas.name}/</file>
</files>
<message>"The following JBoss AS directory doesn't exist :
- ${jbossas.path}/${jbossas.name}"
+ ${jbossas.path}/${jbossas.name}
+
+Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location.
+You can also use -Pdownload to automatically provide JBoss AS instance.
+"
</message>
</requireFilesExist>
</rules>
13 years, 3 months
- 1
- 0
gatein SVN: r5796 - portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-01-20 03:35:09 -0500 (Thu, 20 Jan 2011)
New Revision: 5796
Modified:
portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java
Log:
GNTPORTAL-1712: Make sure the path to container.js begins a leading slash as mentioned in javadoc of ServletContext. Some application servers such as JBoss, WebSphere requires this leading slash
Modified: portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java 2011-01-20 03:34:15 UTC (rev 5795)
+++ portal/branches/branch-GTNPORTAL-1745/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GateInGuiceServletContextListener.java 2011-01-20 08:35:09 UTC (rev 5796)
@@ -32,6 +32,14 @@
@Override
public String loadContentAsString(String path, String encoding) throws IOException{
+ //To make sure that the path begins with a slash, as required in the javadoc of method
+ // getResourceAsStream in ServletContext
+ //The leading slash is required on certain application servers such as JBoss, WebSphere
+ if('/' != path.charAt(0))
+ {
+ path = '/' + path;
+ }
+
InputStream is = scontext.getResourceAsStream(path);
if(is == null)
13 years, 3 months
- 1
- 0
gatein SVN: r5795 - in components/mop/trunk: core and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-01-19 22:34:15 -0500 (Wed, 19 Jan 2011)
New Revision: 5795
Modified:
components/mop/trunk/core/pom.xml
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Secured.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java
components/mop/trunk/pom.xml
Log:
GTNMOP-30 : Update to Chromattic 1.0.5 / JCR 1.12.6
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/pom.xml 2011-01-20 03:34:15 UTC (rev 5795)
@@ -98,6 +98,35 @@
<build>
<plugins>
+<!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <compilerArgument>-proc:none</compilerArgument>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-testCompile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <compilerArgument>-proc:none</compilerArgument>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2011-01-20 03:34:15 UTC (rev 5795)
@@ -18,6 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
+import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.MappedBy;
@@ -29,6 +30,7 @@
public abstract class GroupSiteContainer extends SiteContainer<GroupSite>
{
+ @OneToOne
@MappedBy("mop:groupsites")
public abstract WorkspaceImpl getWorkspace();
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2011-01-20 03:34:15 UTC (rev 5795)
@@ -53,7 +53,7 @@
@OneToMany(type = RelationshipType.PATH)
@MappedBy("mop:template")
- public abstract Collection<? extends WorkspaceObject> getTemplatizedObjects();
+ public abstract Collection<? extends TemplatizedImpl> getTemplatizedObjects();
@OneToOne
@MappedBy("mop:children")
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2011-01-20 03:34:15 UTC (rev 5795)
@@ -18,6 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
+import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.MappedBy;
@@ -29,6 +30,7 @@
public abstract class PortalSiteContainer extends SiteContainer<PortalSite>
{
+ @OneToOne
@MappedBy("mop:portalsites")
public abstract WorkspaceImpl getWorkspace();
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java 2011-01-20 03:34:15 UTC (rev 5795)
@@ -19,9 +19,11 @@
package org.gatein.mop.core.api.workspace;
import org.chromattic.api.annotations.FormattedBy;
+import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.Site;
import org.gatein.mop.core.api.MOPFormatter;
@@ -33,13 +35,13 @@
* @version $Revision$
*/
@FormattedBy(MOPFormatter.class)
-public abstract class SiteContainer<T extends Site>
+@PrimaryType(name = "foo")
+public abstract class SiteContainer<T extends SiteImpl>
{
@OneToMany
public abstract Map<String, T> getSites();
- @OneToOne
public abstract WorkspaceImpl getWorkspace();
public T addSite(String siteName)
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2011-01-20 03:34:15 UTC (rev 5795)
@@ -18,6 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
+import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.MappedBy;
@@ -29,6 +30,7 @@
public abstract class UserSiteContainer extends SiteContainer<UserSite>
{
+ @OneToOne
@MappedBy("mop:usersites")
public abstract WorkspaceImpl getWorkspace();
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2011-01-20 03:34:15 UTC (rev 5795)
@@ -76,19 +76,19 @@
// Workspace implementation ******************************************************************************************
@SuppressWarnings("unchecked")
- private <S extends Site> SiteContainer<S> getSiteContainer(ObjectType<S> siteType)
+ private <S extends Site> SiteContainer getSiteContainer(ObjectType<S> siteType)
{
if (siteType == ObjectType.PORTAL_SITE)
{
- return (SiteContainer<S>)getPortalSites();
+ return getPortalSites();
}
else if (siteType == ObjectType.GROUP_SITE)
{
- return (SiteContainer<S>)getGroupSites();
+ return getGroupSites();
}
else if (siteType == ObjectType.USER_SITE)
{
- return (SiteContainer<S>)getUserSites();
+ return getUserSites();
}
else
{
@@ -98,8 +98,8 @@
public <S extends Site> S getSite(ObjectType<S> siteType, String siteName)
{
- SiteContainer<S> sites = getSiteContainer(siteType);
- return sites.getSite(siteName);
+ SiteContainer sites = getSiteContainer(siteType);
+ return (S)sites.getSite(siteName);
}
public Collection<Site> getSites()
@@ -109,13 +109,13 @@
public <S extends Site> Collection<S> getSites(ObjectType<S> siteType)
{
- SiteContainer<S> sites = getSiteContainer(siteType);
+ SiteContainer sites = getSiteContainer(siteType);
return sites.getAllSites();
}
public <S extends Site> S addSite(ObjectType<S> siteType, String name)
{
- SiteContainer<S> sites = getSiteContainer(siteType);
- return sites.addSite(name);
+ SiteContainer sites = getSiteContainer(siteType);
+ return (S)sites.addSite(name);
}
}
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java 2011-01-20 03:34:15 UTC (rev 5795)
@@ -25,6 +25,9 @@
import org.gatein.mop.core.api.AbstractPOMTestCase;
import org.gatein.mop.core.api.ModelImpl;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
@@ -38,12 +41,14 @@
ModelImpl model = pomService.getModel();
Workspace workspace = model.getWorkspace();
Site site = workspace.addSite(ObjectType.PORTAL_SITE, "adaptablefoo");
- assertFalse(site.isAdapted(Secured.class));
+ assertFalse(site.isAdapted(SecuredImpl.class));
Secured secured = site.adapt(Secured.class);
assertNotNull(secured);
assertTrue(site.isAdapted(Secured.class));
- assertTrue(secured.getPermissions().isEmpty());
- secured.getPermissions().add("FOO");
+ secured.setPermissions(new ArrayList<String>());
+ List<String> permissions = secured.getPermissions();
+ assertTrue(permissions.isEmpty());
+ permissions.add("FOO");
model.save();
}
}
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Secured.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Secured.java 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Secured.java 2011-01-20 03:34:15 UTC (rev 5795)
@@ -30,4 +30,5 @@
List<String> getPermissions();
+ void setPermissions(List<String> permissions);
}
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java 2011-01-20 03:34:15 UTC (rev 5795)
@@ -30,6 +30,7 @@
import org.gatein.mop.core.api.workspace.GroupSite;
import org.gatein.mop.core.api.workspace.GroupSiteContainer;
import org.gatein.mop.core.api.IntegerAttribute;
+import org.gatein.mop.core.api.workspace.LinkImpl;
import org.gatein.mop.core.api.workspace.NavigationContainer;
import org.gatein.mop.core.api.workspace.NavigationImpl;
import org.gatein.mop.core.api.workspace.PageContainer;
@@ -39,19 +40,27 @@
import org.gatein.mop.core.api.workspace.PortalSiteContainer;
import org.gatein.mop.core.api.workspace.SecuredImpl;
import org.gatein.mop.core.api.StringAttribute;
+import org.gatein.mop.core.api.workspace.SiteContainer;
+import org.gatein.mop.core.api.workspace.SiteImpl;
import org.gatein.mop.core.api.workspace.TemplatizedImpl;
import org.gatein.mop.core.api.workspace.UIBodyImpl;
+import org.gatein.mop.core.api.workspace.UIComponentImpl;
import org.gatein.mop.core.api.workspace.UIContainerImpl;
import org.gatein.mop.core.api.workspace.UIWindowImpl;
import org.gatein.mop.core.api.workspace.URLLinkImpl;
import org.gatein.mop.core.api.workspace.UserSite;
import org.gatein.mop.core.api.workspace.UserSiteContainer;
+import org.gatein.mop.core.api.workspace.WorkspaceCustomizationContextImpl;
import org.gatein.mop.core.api.workspace.WorkspaceImpl;
+import org.gatein.mop.core.api.workspace.WorkspaceObjectImpl;
+import org.gatein.mop.core.api.workspace.content.AbstractCustomization;
+import org.gatein.mop.core.api.workspace.content.AbstractCustomizationState;
import org.gatein.mop.core.api.workspace.content.ContextSpecialization;
import org.gatein.mop.core.api.workspace.content.ContextType;
import org.gatein.mop.core.api.workspace.content.ContextTypeContainer;
import org.gatein.mop.core.api.workspace.content.CustomizationContainer;
import org.gatein.mop.core.api.workspace.content.WorkspaceClone;
+import org.gatein.mop.core.api.workspace.content.WorkspaceCustomization;
import org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization;
import org.gatein.mop.core.support.content.gadget.Gadget;
import org.gatein.mop.core.support.content.gadget.GadgetContentProvider;
@@ -85,7 +94,9 @@
builder.setOptionValue(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl");
//
+ builder.add(WorkspaceObjectImpl.class);
builder.add(WorkspaceImpl.class);
+ builder.add(UIComponentImpl.class);
builder.add(UIContainerImpl.class);
builder.add(UIWindowImpl.class);
builder.add(UIBodyImpl.class);
@@ -93,8 +104,11 @@
builder.add(PageContainer.class);
builder.add(NavigationImpl.class);
builder.add(NavigationContainer.class);
+ builder.add(LinkImpl.class);
builder.add(PageLinkImpl.class);
builder.add(URLLinkImpl.class);
+ builder.add(SiteImpl.class);
+ builder.add(SiteContainer.class);
builder.add(PortalSiteContainer.class);
builder.add(PortalSite.class);
builder.add(GroupSiteContainer.class);
@@ -116,9 +130,13 @@
builder.add(CustomizationContainer.class);
builder.add(ContextTypeContainer.class);
builder.add(ContextType.class);
+ builder.add(AbstractCustomization.class);
+ builder.add(AbstractCustomizationState.class);
builder.add(ContextSpecialization.class);
+ builder.add(WorkspaceCustomization.class);
builder.add(WorkspaceClone.class);
builder.add(WorkspaceSpecialization.class);
+ builder.add(WorkspaceCustomizationContextImpl.class);
//
builder.add(PortletPreferencesState.class);
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/pom.xml 2011-01-20 03:34:15 UTC (rev 5795)
@@ -127,7 +127,8 @@
<!-- maven-enforcer-plugin -->
<jdk.min.version>1.6</jdk.min.version>
- <org.chromattic.version>1.0.4</org.chromattic.version>
+ <org.chromattic.version>1.0.5</org.chromattic.version>
+ <!--<org.chromattic.version>1.1.0-SNAPSHOT</org.chromattic.version>-->
</properties>
13 years, 3 months
- 1
- 0
gatein SVN: r5794 - in portal/trunk/packaging: jboss-as6 and 1 other directory.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-01-19 15:40:55 -0500 (Wed, 19 Jan 2011)
New Revision: 5794
Modified:
portal/trunk/packaging/jboss-as5/README.txt
portal/trunk/packaging/jboss-as5/pom.xml
portal/trunk/packaging/jboss-as6/README.txt
portal/trunk/packaging/jboss-as6/pom.xml
Log:
GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager
- set 'package' as default goal
Modified: portal/trunk/packaging/jboss-as5/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as5/README.txt 2011-01-19 19:58:28 UTC (rev 5793)
+++ portal/trunk/packaging/jboss-as5/README.txt 2011-01-19 20:40:55 UTC (rev 5794)
@@ -41,15 +41,17 @@
Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-5.1.0.GA as the location where JBoss AS is found.
+The default goal is set to 'package' so there is no need to specify it.
+
== Examples ==
1) The simplest form uses default location for JBoss AS
-mvn package
+mvn
This is equivalent to:
@@ -58,28 +60,28 @@
2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly
-mvn package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME
+mvn -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME
3) If JBoss AS is not yet present on the system it can be automatically downloaded and extracted into SERVERS_DIR
-mvn package -Pdownload
+mvn -Pdownload
If SERVERS_DIR is not at default location explicitly set it:
-mvn package -Pdownload -Dservers.dir=SERVERS_DIR
+mvn -Pdownload -Dservers.dir=SERVERS_DIR
You shouldn't set jbossas.name property when using -Pdownload.
4) Zip bundle may be produced by activating 'bundle' profile
-mvn package -Pdownload,bundle
+mvn -Pdownload,bundle
or
-mvn package -Pdefault,bundle
+mvn -Pdefault,bundle
or just
-mvn package -Pbundle
+mvn -Pbundle
Modified: portal/trunk/packaging/jboss-as5/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pom.xml 2011-01-19 19:58:28 UTC (rev 5793)
+++ portal/trunk/packaging/jboss-as5/pom.xml 2011-01-19 20:40:55 UTC (rev 5794)
@@ -13,6 +13,10 @@
<name>GateIn JBoss AS 5.x.x packaging</name>
+ <build>
+ <defaultGoal>package</defaultGoal>
+ </build>
+
<modules>
<module>pkg</module>
</modules>
Modified: portal/trunk/packaging/jboss-as6/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as6/README.txt 2011-01-19 19:58:28 UTC (rev 5793)
+++ portal/trunk/packaging/jboss-as6/README.txt 2011-01-19 20:40:55 UTC (rev 5794)
@@ -39,22 +39,17 @@
Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-6.0.0.Final as the location where JBoss AS is found.
-PKG build uses two equivalent properties:
+The default goal is set to 'package' so there is no need to specify it.
-exo.projects.directory.dependencies
-exo.projects.app.jboss.version
-which can still be used instead of servers.dir and jbossas.name.
-
-
== Examples ==
1) The simplest form uses default location for JBoss AS
-mvn package
+mvn
This is equivalent to:
@@ -63,28 +58,28 @@
2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly
-mvn package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME
+mvn -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME
3) If JBoss AS is not yet present on the system it can be automatically downloaded and extracted into SERVERS_DIR
-mvn package -Pdownload
+mvn -Pdownload
If SERVERS_DIR is not at default location explicitly set it:
-mvn package -Pdownload -Dservers.dir=SERVERS_DIR
+mvn -Pdownload -Dservers.dir=SERVERS_DIR
You shouldn't set jbossas.name property when using -Pdownload.
4) Zip bundle may be produced by activating 'bundle' profile
-mvn package -Pdownload,bundle
+mvn -Pdownload,bundle
or
-mvn package -Pdefault,bundle
+mvn -Pdefault,bundle
or just
-mvn package -Pbundle
+mvn -Pbundle
Modified: portal/trunk/packaging/jboss-as6/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pom.xml 2011-01-19 19:58:28 UTC (rev 5793)
+++ portal/trunk/packaging/jboss-as6/pom.xml 2011-01-19 20:40:55 UTC (rev 5794)
@@ -13,6 +13,10 @@
<name>GateIn JBoss AS 6.x.x packaging</name>
+ <build>
+ <defaultGoal>package</defaultGoal>
+ </build>
+
<modules>
<module>pkg</module>
</modules>
13 years, 3 months
- 1
- 0
gatein SVN: r5793 - in components/pc/trunk: portal/src/assemble and 15 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-01-19 14:58:28 -0500 (Wed, 19 Jan 2011)
New Revision: 5793
Added:
components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml
components/pc/trunk/portal/src/assemble/simple-portal-war-jboss6.xml
components/pc/trunk/portal/src/main/resources/jboss6/
components/pc/trunk/portal/src/main/resources/jboss6/META-INF/
components/pc/trunk/portal/src/main/resources/jboss6/META-INF/jboss-structure.xml
components/pc/trunk/test/servers/jboss6/
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jboss6/src/
components/pc/trunk/test/servers/jboss6/src/test/
components/pc/trunk/test/servers/jboss6/src/test/build.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/
components/pc/trunk/test/servers/jboss6/src/test/resources/config/
components/pc/trunk/test/servers/jboss6/src/test/resources/config/context.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/classes/
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/context.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/classes/
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/context.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/test/
components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/
components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/jboss-portlet.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/portlet.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/test/local-jboss-unit.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/test/remote-jboss-unit.xml
components/pc/trunk/test/servers/jboss6/src/test/resources/test/servers.xml
Modified:
components/pc/trunk/pom.xml
components/pc/trunk/test/servers/pom.xml
Log:
GTNPC-55: Add tests for JBoss 6
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-01-19 19:32:39 UTC (rev 5792)
+++ components/pc/trunk/pom.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -46,7 +46,7 @@
<properties>
<version.gatein.common>2.0.3-GA</version.gatein.common>
- <version.gatein.wci>2.1.0-Alpha02</version.gatein.wci>
+ <version.gatein.wci>2.1.0-Alpha03</version.gatein.wci>
<version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
<version.apache.taglibs>1.1.2</version.apache.taglibs>
<version.apache.log4j>1.2.14</version.apache.log4j>
@@ -143,6 +143,11 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jboss6</artifactId>
+ <version>${version.gatein.wci}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
<artifactId>wci-jetty</artifactId>
<version>${version.gatein.wci}</version>
</dependency>
Added: components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml (rev 0)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss6.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,54 @@
+<assembly>
+ <id>jboss6</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <baseDirectory>simple-portal</baseDirectory>
+
+ <componentDescriptors>
+ <componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
+ <componentDescriptor>src/assemble/simple-portal-war-jboss6.xml</componentDescriptor>
+ </componentDescriptors>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+
+ <include>org.gatein.common:common-common</include>
+ <include>org.gatein.common:common-logging</include>
+ <include>javax.portlet:portlet-api</include>
+ <include>org.gatein.wci:wci-wci</include>
+ <include>org.gatein.wci:wci-jboss6</include>
+
+ <include>org.gatein.pc:pc-portlet</include>
+ <include>org.gatein.pc:pc-api</include>
+ <include>javax.ccpp:ccpp</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
+ <includes>
+
+
+ <include>org.gatein.common:common-mc</include>
+ <include>org.gatein.pc:pc-controller</include>
+ <include>org.gatein.pc:pc-mc</include>
+
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>org.jboss:jbossxb</include>
+
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include></include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Added: components/pc/trunk/portal/src/assemble/simple-portal-war-jboss6.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-war-jboss6.xml (rev 0)
+++ components/pc/trunk/portal/src/assemble/simple-portal-war-jboss6.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,12 @@
+<component>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>src/main/resources/jboss6</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+
+ </fileSets>
+
+</component>
Added: components/pc/trunk/portal/src/main/resources/jboss6/META-INF/jboss-structure.xml
===================================================================
--- components/pc/trunk/portal/src/main/resources/jboss6/META-INF/jboss-structure.xml (rev 0)
+++ components/pc/trunk/portal/src/main/resources/jboss6/META-INF/jboss-structure.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<structure>
+ <context>
+ <path name=""/>
+ <metaDataPath>
+ <path name="META-INF"/>
+ <path name=""/>
+ </metaDataPath>
+ <classpath>
+ <path name=""/>
+ <path name="lib" suffixes=".jar" />
+ </classpath>
+ </context>
+ <context>
+ <path name="simple-portal.war"/>
+ <metaDataPath>
+ <path name="WEB-INF"/>
+ <path name="META-INF"/>
+ </metaDataPath>
+ <classpath>
+ <path name=""/>
+ <path name="lib" suffixes=".jar"/>
+ <path name="simple-portal.war/WEB-INF/lib" suffixes=".jar"/>
+ <path name="simple-portal.war/WEB-INF/classes"/>
+ </classpath>
+ </context>
+</structure>
+
Added: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,385 @@
+<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">
+ <parent>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-servers</artifactId>
+ <version>2.3.0-Alpha02-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>pc-test-jboss6</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn - Portlet Container (test - servers - JBoss 6)</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-controller</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-portlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-mc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>cargo</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-remote</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>cargo</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-tooling-ant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>portal-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>portal-test-generic</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-jdk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.ccpp</groupId>
+ <artifactId>ccpp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- JSTL for Tomcat -->
+ <dependency>
+ <groupId>apache-taglibs</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jboss6</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-ant-tasks</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+ <!--By default Annotation Processing Tool related classes need to be disabled-->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>org/gatein/pc/test/unit/reports/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>apt</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
+ <force>true</force>
+ <target>1.5</target>
+ <nocompile>true</nocompile>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ <goals>
+ <goal>testExecute</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!--On MacOSX the tools.jar should be already in the classpath-->
+ <profile>
+ <id>apt-mac</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
+ <force>true</force>
+ <target>1.5</target>
+ <nocompile>true</nocompile>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ <goals>
+ <goal>testExecute</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>cargo.debug</id>
+ <properties>
+ <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug>
+ </properties>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-common-build.xml</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.5</version>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-tooling-ant</artifactId>
+ <version>${version.jboss.unit}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit</artifactId>
+ <version>${version.jboss.unit}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>${version.cargo}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+
+ <property name="compile_classpath" refid="maven.compile.classpath" />
+ <property name="runtime_classpath" refid="maven.runtime.classpath" />
+ <property name="test_classpath" refid="maven.test.classpath" />
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <property name="project.version" value="${project.version}" />
+ <property name="basedir" value="${basedir}" />
+
+ <condition property="cargo.debug" value="${test.cargo.debug}">
+ <isset property="test.cargo.debug" />
+ </condition>
+ <condition property="cargo.debug" value="">
+ <not>
+ <isset property="test.cargo.debug" />
+ </not>
+ </condition>
+
+ <!-- location of common.xml shared between the different server's build.xml -->
+ <!-- for now hardcode like that, it should be probably moved to the test-core package -->
+ <property name="common.xml.file" value="${project.basedir}/../src/common/resources/common.xml" />
+
+ <ant antfile="${basedir}/src/test/build.xml" inheritRefs="true">
+ <target name="tests" />
+ </ant>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <!-- Fix 1.0.3 deployment problems with jboss6 deployer-->
+ <version.cargo>1.0.2</version.cargo>
+ </properties>
+</project>
Added: components/pc/trunk/test/servers/jboss6/src/test/build.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/build.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/build.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<project name="jboss-6-integration-test" default="tests">
+
+ <import file="${common.xml.file}"/>
+
+ <!-- SYSTEM PROPERTIES -->
+ <property environment="env"/>
+ <property name="test.cargo.home" value="${env.JBOSS_6_HOME}"/>
+
+
+ <!-- properties unique per app server -->
+ <property name="test.server.name" value="JBoss"/>
+ <property name="test.server.version" value="6"/>
+ <property name="test.remote.server.name" value="RemoteJBoss_6"/>
+ <property name="cargo.container.id" value="jboss6x"/>
+
+ <path id="JBoss-6">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-xb"/>
+ <path location="${org.jboss:jboss-common-core:jar}"/>
+ </path>
+
+ <path id="JBoss-6-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path location="${javax.ccpp:ccpp:jar}"/>
+ <path location="${org.gatein.wci:wci-jboss6:jar}"/>
+
+ <!-- paths needed for remote jboss deployment -->
+ <path location="${org.codehaus.cargo:cargo-core-tools-jboss-deployer-5.1-and-onwards:jar}"/>
+ <path location="${org.jboss.integration:jboss-profileservice-spi:jar}"/>
+ <path location="${org.codehaus.cargo:cargo-core-container-jboss:jar}"/>
+ </path>
+
+ <target name="tests" unless="maven.test.skip">
+
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_6_HOME" value="${env.JBOSS_6_HOME}">
+ <and>
+ <isset property="env.JBOSS_6_HOME"/>
+ <not>
+ <isset property="JBOSS_6_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <echo message="JBOSS_6_HOME: ${JBOSS_6_HOME}"/>
+ <fail message="Please set the environment variable JBOSS_6_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JBOSS_6_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
+ <antcall target="tests.common"/>
+ </target>
+
+ <target name="cargo.start" depends="cargo.setup">
+
+ <taskdef resource="cargo.tasks">
+ <classpath>
+ <pathelement path="${plugin_classpath}"/>
+ </classpath>
+ </taskdef>
+
+ <cargo
+ containerId="jboss6x"
+ home="${test.cargo.home}"
+ output="${cargo.log.dir}/cargo.${test.server.name}-${test.server.version}.server.log"
+ log="${cargo.log.dir}/cargo.${test.server.name}-${test.server.version}.start.log"
+ action="start"
+ wait="${cargo.wait}">
+ <sharedClasspath>
+ <path refid="JBoss-6-shared"/>
+ </sharedClasspath>
+ <configuration home="${test.cargo.dir}">
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <property name="cargo.rmi.port" value="1099"/>
+ <property name="cargo.jvmargs" value="-Duser.language=en ${cargo.debug}"/>
+ <deployable type="war" file="${test.temp.lib}/JBoss-6/portlet-test.war"/>
+ <file file="${target}/test-classes/config/context.xml" tofile="deploy/jbossweb.sar/context.xml" overwrite="true"/>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="cargo.stop" depends="cargo.setup">
+ <cargo
+ containerId="jboss6x"
+ home="${test.cargo.home}"
+ log="${cargo.log.dir}/cargo.${test.server.name}-${test.server.version}.shutdown.log"
+ action="stop">
+ <configuration home="${test.cargo.dir}"/>
+ </cargo>
+ </target>
+</project>
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/config/context.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/config/context.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/config/context.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,20 @@
+<!-- The contents of this file will be loaded for each web application -->
+<Context cookies="true" crossContext="true">
+ <!-- Session persistence is disable by default. To enable for all web
+ apps set the pathname to a non-empty value:
+ <Manager pathname="SESSIONS.ser" />
+
+ To enable session persistence for a single web app, add a
+ WEB-INF/context.xml
+ -->
+ <Manager pathname="" />
+
+ <!-- Install an InstanceListener to handle the establishment of the run-as
+ role for servlet init/destroy events.
+ -->
+ <InstanceListener>org.jboss.web.tomcat.security.RunAsListener</InstanceListener>
+
+ <!-- Needed for portal session paths -->
+ <SessionCookie path="/"/>
+
+</Context>
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/context.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/context.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/context.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,2 @@
+<Context privileged="true">
+</Context>
\ No newline at end of file
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/jboss-web.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+<jboss-web>
+ <class-loading java2ClassLoadingCompliance="true">
+ <loader-repository>test:loader=portlet</loader-repository>
+ </class-loading>
+</jboss-web>
\ No newline at end of file
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/web.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>ContainerServlet</servlet-name>
+ <servlet-class>org.gatein.wci.jboss.JB6ContainerServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>PortalServlet</servlet-name>
+ <servlet-class>org.gatein.pc.test.tck.TCKServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/context.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/context.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/context.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,24 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<Context privileged="true">
+</Context>
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/jboss-web.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+<jboss-web>
+ <class-loading java2ClassLoadingCompliance="true">
+ <loader-repository>test:loader=portlet</loader-repository>
+ </class-loading>
+</jboss-web>
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/web.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/portlet-test-war/WEB-INF/web.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>ContainerServlet</servlet-name>
+ <servlet-class>org.gatein.wci.jboss.JB6ContainerServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>PortalServlet</servlet-name>
+ <servlet-class>org.gatein.pc.test.PortalServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/jboss-portlet.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/jboss-portlet.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/jboss-portlet.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,56 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<portlet-app>
+ <remotable>true</remotable>
+ <portlet>
+ <portlet-name>Portlet1</portlet-name>
+ <remotable>false</remotable>
+ <transaction>
+ <trans-attribute>Required</trans-attribute>
+ </transaction>
+ <security-constraint>
+ <policy-permission>
+ <role-name>Admin</role-name>
+ <action-name>view</action-name>
+ <action-name>create</action-name>
+ </policy-permission>
+ <policy-permission>
+ <role-name>User</role-name>
+ <action-name>view</action-name>
+ </policy-permission>
+ <policy-permission>
+ <role-name>User</role-name>
+ <action-name>destroy</action-name>
+ </policy-permission>
+ </security-constraint>
+ </portlet>
+ <portlet>
+ <portlet-name>Portlet2</portlet-name>
+ </portlet>
+ <service>
+ <service-name>PortalObjectContainer</service-name>
+ <service-class>org.jboss.portal.core.model.portal.PortalObjectContainer</service-class>
+ <service-ref>:container=PortalObject</service-ref>
+ </service>
+</portlet-app>
Property changes on: components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/jboss-portlet.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/portlet.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/portlet.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/portlet.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ version="1.0">
+ <portlet>
+ <description>default</description>
+ <description xml:lang="fr">defaut</description>
+ <portlet-name>Portlet1</portlet-name>
+ <display-name>display</display-name>
+ <display-name xml:lang="fr">affichage</display-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestPortlet</portlet-class>
+ <init-param>
+ <description>first parameter</description>
+ <description xml:lang="fr">premier parametre</description>
+ <name>one</name>
+ <value>1</value>
+ </init-param>
+ <init-param>
+ <description>second parameter</description>
+ <description xml:lang="fr">deuxieme parametre</description>
+ <name>two</name>
+ <value>2</value>
+ </init-param>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ </supports>
+ <supports>
+ <mime-type>text/wml</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>fr</supported-locale>
+ <resource-bundle>MyResourceBundle</resource-bundle>
+ <portlet-info>
+ <title>very long portlet title</title>
+ <short-title>short portlet title</short-title>
+ <keywords>a,b,c,d,e,f</keywords>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>one</name>
+ <value>1</value>
+ </preference>
+ <preference>
+ <name>two</name>
+ <value>2</value>
+ <read-only>false</read-only>
+ </preference>
+ <preference>
+ <name>three</name>
+ <value>3</value>
+ <read-only>true</read-only>
+ </preference>
+ <preference>
+ <name>all</name>
+ <value>1</value>
+ <value>2</value>
+ <value>3</value>
+ </preference>
+ <preferences-validator>MyValidator</preferences-validator>
+ </portlet-preferences>
+ <security-role-ref>
+ <description>role with no link</description>
+ <description xml:lang="fr">role sans link</description>
+ <role-name>ROLE_NAME_WITHOUT_LINK</role-name>
+ </security-role-ref>
+ <security-role-ref>
+ <description>role with link</description>
+ <description xml:lang="fr">role avec link</description>
+ <role-name>ROLE_NAME_WITH_LINK</role-name>
+ <role-link>ROLE_LINK</role-link>
+ </security-role-ref>
+ </portlet>
+
+ <!--
+ <portlet>
+ <portlet-name>Portlet2</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestSessionPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>test the portlet session</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>Portlet3</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestDispatcherPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>test the portlet request dispatcher</title>
+ </portlet-info>
+ </portlet>
+ -->
+
+ <portlet>
+ <portlet-name>Portlet4</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestRedirectPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>test the portlet redirection</title>
+ </portlet-info>
+ </portlet>
+
+ <!--
+ <portlet>
+ <portlet-name>Portlet5</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestPortletPreferencesPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>test the portlet preferences</title>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>one</name>
+ <value>1</value>
+ </preference>
+ <preference>
+ <name>two</name>
+ <value>2</value>
+ <read-only>false</read-only>
+ </preference>
+ <preference>
+ <name>three</name>
+ <value>3</value>
+ <read-only>true</read-only>
+ </preference>
+ <preference>
+ <name>all</name>
+ <value>1</value>
+ <value>2</value>
+ <value>3</value>
+ </preference>
+ </portlet-preferences>
+ </portlet>
+
+ <portlet>
+ <portlet-name>Portlet6</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestResourceBundlePortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>fr</supported-locale>
+ <resource-bundle>Portlet6</resource-bundle>
+ <portlet-info>
+ <title>Very long portlet title</title>
+ <short-title>Short portlet title</short-title>
+ <keywords>a,b,c,d,e,f</keywords>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>Portlet7</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestExceptionDuringActionPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>Test exception during the action request</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>Portlet8</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestSecurityPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>Test portlet security</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>Portlet9</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestUserInformationPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>Test user information</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>Portlet10</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestPortletModePortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>Test portlet modes</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>Portlet11</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestSecuredProtocolPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>Test https URL</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>Portlet12</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.TestCachedContentPortlet</portlet-class>
+ <expiration-cache>60</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>Test cached content</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>Portlet13</portlet-name>
+ <portlet-class>org.jboss.portal.test.portlet.CrossContextSessionPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>Test cross session context</title>
+ </portlet-info>
+ </portlet>
+ -->
+
+ <custom-portlet-mode>
+ <description>first mode</description>
+ <description xml:lang="fr">premier mode</description>
+ <portlet-mode>configure</portlet-mode>
+ </custom-portlet-mode>
+ <custom-portlet-mode>
+ <description>second mode</description>
+ <portlet-mode>inactive</portlet-mode>
+ </custom-portlet-mode>
+ <custom-window-state>
+ <description>first state</description>
+ <description xml:lang="fr">premier etat</description>
+ <window-state>blur</window-state>
+ </custom-window-state>
+ <custom-window-state>
+ <description>second state</description>
+ <window-state>black and white</window-state>
+ </custom-window-state>
+ <user-attribute>
+ <description>first attribute</description>
+ <description xml:lang="fr">premier attribut</description>
+ <name>att1</name>
+ </user-attribute>
+ <user-attribute>
+ <description>second attribute</description>
+ <name>att2</name>
+ </user-attribute>
+
+ <security-constraint>
+ <portlet-collection>
+ <portlet-name>Portlet1</portlet-name>
+ </portlet-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <security-constraint>
+ <portlet-collection>
+ <portlet-name>Portlet1</portlet-name>
+ <portlet-name>Portlet4</portlet-name>
+ </portlet-collection>
+ <user-data-constraint>
+ <transport-guarantee>INTEGRAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
+</portlet-app>
Property changes on: components/pc/trunk/test/servers/jboss6/src/test/resources/test/deployment/portlet.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/test/local-jboss-unit.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/test/local-jboss-unit.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/test/local-jboss-unit.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-unit
+ xmlns="urn:jboss:jboss-unit:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd">
+ <pojo>
+ <test>
+ <class name="org.gatein.pc.test.PortletUtilsTestCase">
+ </class>
+ </test>
+ <test>
+ <class name="org.gatein.pc.test.url.DecoderTestCase">
+ </class>
+ </test>
+ <test>
+ <class name="org.gatein.pc.test.url.EncoderTestCase">
+ </class>
+ </test>
+ <test>
+ <class name="org.gatein.pc.test.StringCodecTestCase">
+ </class>
+ </test>
+ <test>
+ <class name="org.gatein.pc.controller.StateControllerContextTestCase">
+ </class>
+ </test>
+ </pojo>
+</jboss-unit>
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/test/remote-jboss-unit.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/test/remote-jboss-unit.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/test/remote-jboss-unit.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-unit
+ xmlns="urn:jboss:jboss-unit:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd">
+
+ <!--Spec TCK Assertions tests-->
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-dispatcher.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-portletconfig.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-portletcontext.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-portletinterface.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-portletmode.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-portletrequests.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-portletresponses.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-portletsession.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-portleturl.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-preferences.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-tck-windowstates.war"/>
+ </generic>
+
+ <!--API Tests-->
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-actionrequest.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-actionresponse.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-portalcontext.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-portletconfig.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-portletcontext.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-portletmode.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-portletpreferences.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-portletsession.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-portletsessionutil.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-portleturl.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-renderrequest.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-renderresponse.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-api-windowstate.war"/>
+ </generic>
+
+ <!--Ext Tests-->
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-portletconfig.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-portletmode.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-portletrequests.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-portletresponses.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-preferences.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-session.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-expiringcache.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-neverexpiringcache.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-nocache.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-ext-taglib.war"/>
+ </generic>
+
+ <!--Spec TCK Assertions tests-->
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-dispatcher.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-portletconfig.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-portletconfignonamespace.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-event.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-eventnonamespace.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-stateawareresponse.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-portletrequests.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-resourceserving.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-portleturl.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-portletfilter.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-taglib.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-tck-userinformation.war"/>
+ </generic>
+
+ <!--Spec API Assertions tests-->
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-api-event.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-api-portleturl.war"/>
+ </generic>
+
+ <!--Ext Assertions tests-->
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-portletrequests.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-portletresponses.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-dispatcher.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-portletfilter.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-portletcontext.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-portletinterface.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-event.war"/>
+ </generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-portletmode.war"/>
+ </generic>
+
+ <!--Misc Tests-->
+<!--
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr168-misc-log4j.war"/>
+ </generic>
+-->
+
+</jboss-unit>
Added: components/pc/trunk/test/servers/jboss6/src/test/resources/test/servers.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/src/test/resources/test/servers.xml (rev 0)
+++ components/pc/trunk/test/servers/jboss6/src/test/resources/test/servers.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -0,0 +1,21 @@
+<servers>
+ <server>
+ <server-name>RemoteJBoss_6</server-name>
+ <node>
+ <node-id>default</node-id>
+ <service>
+ <service-name>TestDriverServer</service-name>
+ <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
+ <uri>socket://localhost:5400</uri>
+ </service>
+ <deployer>
+ <remote>
+ <name>jboss6x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ </deployer>
+ </node>
+ </server>
+
+</servers>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-01-19 19:32:39 UTC (rev 5792)
+++ components/pc/trunk/test/servers/pom.xml 2011-01-19 19:58:28 UTC (rev 5793)
@@ -66,6 +66,7 @@
<module>tomcat6</module>
<module>tomcat7</module>
<module>jboss51</module>
+ <module>jboss6</module>
<module>jetty6</module>
</modules>
</profile>
@@ -111,10 +112,17 @@
</modules>
</profile>
<profile>
+ <id>jboss6</id>
+ <modules>
+ <module>jboss6</module>
+ </modules>
+ </profile>
+ <profile>
<id>jboss</id>
<modules>
<module>jboss42</module>
<module>jboss51</module>
+ <module>jboss6</module>
</modules>
</profile>
<profile>
13 years, 3 months
- 1
- 0
gatein SVN: r5792 - in portal/trunk/packaging: jboss-as5/pkg and 2 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-01-19 14:32:39 -0500 (Wed, 19 Jan 2011)
New Revision: 5792
Modified:
portal/trunk/packaging/jboss-as5/README.txt
portal/trunk/packaging/jboss-as5/pkg/package.xml
portal/trunk/packaging/jboss-as5/pkg/pom.xml
portal/trunk/packaging/jboss-as6/README.txt
portal/trunk/packaging/jboss-as6/pkg/package.xml
portal/trunk/packaging/jboss-as6/pkg/pom.xml
Log:
GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager
- removed compatibility with old properties to avoid unexpected behaviour
- added automatic clean for ?\226?\128?\152default?\226?\128?\153 and ?\226?\128?\152download?\226?\128?\153 profiles
- removed chmod 664 on all non-executables due to ARG_MAX issue on Mac OS X
Modified: portal/trunk/packaging/jboss-as5/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as5/README.txt 2011-01-19 08:09:28 UTC (rev 5791)
+++ portal/trunk/packaging/jboss-as5/README.txt 2011-01-19 19:32:39 UTC (rev 5792)
@@ -28,62 +28,57 @@
There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Pdefault), and bundling as a zip (-Pbundle).
For main build use either 'download' or 'default' profile, but not both, as 'download' also includes 'default' functionality.
+Both of these profiles also automatically perform 'clean' to assure consistent results.
Profile 'default' is the one active by default. When activating any other profile, the 'default' profile is automatically turned off, so
it may have to be explicitly activated again if packaging is required (i.e. -Pdefault,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:
-servers.dir=../../pkg/servers
+servers.dir=${project.basedir}/../../pkg/servers
jbossas.name=jboss-5.1.0.GA
-Together they resolve into ../../pkg/servers/jboss-5.1.0.GA as the location where JBoss AS is found.
+Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-5.1.0.GA as the location where JBoss AS is found.
-PKG build uses two equivalent properties:
-exo.projects.directory.dependencies
-exo.projects.app.jboss.version
-which can still be used instead of servers.dir and jbossas.name.
-
-
-
== Examples ==
1) The simplest form uses default location for JBoss AS
-mvn clean package
+mvn package
This is equivalent to:
-mvn clean package -Pdefault -Dservers.dir=../../pkg/servers -Djbossas.name=jboss-5.1.0.GA
+mvn clean package -Pdefault -Dservers.dir=$GATEIN/portal/trunk/packaging/pkg/servers -Djbossas.name=jboss-5.1.0.GA
2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly
-mvn clean package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME
+mvn package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME
3) If JBoss AS is not yet present on the system it can be automatically downloaded and extracted into SERVERS_DIR
-mvn clean package -Pdownload
+mvn package -Pdownload
If SERVERS_DIR is not at default location explicitly set it:
-mvn clean package -Pdownload -Dservers.dir=SERVERS_DIR
+mvn package -Pdownload -Dservers.dir=SERVERS_DIR
You shouldn't set jbossas.name property when using -Pdownload.
4) Zip bundle may be produced by activating 'bundle' profile
-mvn clean package -Pdownload,bundle
+mvn package -Pdownload,bundle
or
-mvn clean package -Pdefault,bundle
+mvn package -Pdefault,bundle
or just
Modified: portal/trunk/packaging/jboss-as5/pkg/package.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/package.xml 2011-01-19 08:09:28 UTC (rev 5791)
+++ portal/trunk/packaging/jboss-as5/pkg/package.xml 2011-01-19 19:32:39 UTC (rev 5792)
@@ -41,7 +41,8 @@
preservelastmodified="true" overwrite="true"/>
<!-- File permissions -->
- <chmod perm="0644" type="file" dir="${jbossas.target.dir}" excludes="**/*.sh"/>
+ <!-- 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>
Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-19 08:09:28 UTC (rev 5791)
+++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-19 19:32:39 UTC (rev 5792)
@@ -19,11 +19,9 @@
<properties>
<jbossas.version>5.1.0.GA</jbossas.version>
<jbossas.dist.version>5.1.0.GA-jdk6</jbossas.dist.version>
- <exo.projects.directory.dependencies>${project.basedir}/../../pkg/servers</exo.projects.directory.dependencies>
- <exo.projects.app.jboss.version>jboss-${jbossas.version}</exo.projects.app.jboss.version>
- <servers.dir>${exo.projects.directory.dependencies}</servers.dir>
+ <servers.dir>${project.basedir}/../../pkg/servers</servers.dir>
<jbossas.path>${servers.dir}</jbossas.path>
- <jbossas.name>${exo.projects.app.jboss.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>
<wsrp.version>2.0.0-GA</wsrp.version>
@@ -916,6 +914,19 @@
<build>
<plugins>
<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>
@@ -1005,8 +1016,20 @@
</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>
Modified: portal/trunk/packaging/jboss-as6/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as6/README.txt 2011-01-19 08:09:28 UTC (rev 5791)
+++ portal/trunk/packaging/jboss-as6/README.txt 2011-01-19 19:32:39 UTC (rev 5792)
@@ -26,16 +26,18 @@
There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Pdefault), and bundling as a zip (-Pbundle).
For main build use either 'download' or 'default' profile, but not both, as 'download' also includes 'default' functionality.
+Both of these profiles also automatically perform 'clean' to assure consistent results.
Profile 'default' is the one active by default. When activating any other profile, the 'default' profile is automatically turned off, so
it may have to be explicitly activated again if packaging is required (i.e. -Pdefault,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:
-servers.dir=../../pkg/servers
+servers.dir=${project.basedir}/../../pkg/servers
jbossas.name=jboss-6.0.0.Final
-Together they resolve into ../../pkg/servers/jboss-6.0.0.Final as the location where JBoss AS is found.
+Together they resolve into $GATEIN/portal/trunk/packaging/pkg/servers/jboss-6.0.0.Final as the location where JBoss AS is found.
PKG build uses two equivalent properties:
@@ -52,36 +54,36 @@
1) The simplest form uses default location for JBoss AS
-mvn clean package
+mvn package
This is equivalent to:
-mvn clean package -Pdefault -Dservers.dir=../../pkg/servers -Djbossas.name=jboss-6.0.0.Final
+mvn clean package -Pdefault -Dservers.dir=$GATEIN/portal/trunk/packaging/pkg/servers -Djbossas.name=jboss-6.0.0.Final
2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly
-mvn clean package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME
+mvn package -Dservers.dir=SERVERS_DIR -Djbossas.name=JBOSSAS_NAME
3) If JBoss AS is not yet present on the system it can be automatically downloaded and extracted into SERVERS_DIR
-mvn clean package -Pdownload
+mvn package -Pdownload
If SERVERS_DIR is not at default location explicitly set it:
-mvn clean package -Pdownload -Dservers.dir=SERVERS_DIR
+mvn package -Pdownload -Dservers.dir=SERVERS_DIR
You shouldn't set jbossas.name property when using -Pdownload.
4) Zip bundle may be produced by activating 'bundle' profile
-mvn clean package -Pdownload,bundle
+mvn package -Pdownload,bundle
or
-mvn clean package -Pdefault,bundle
+mvn package -Pdefault,bundle
or just
Modified: portal/trunk/packaging/jboss-as6/pkg/package.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/package.xml 2011-01-19 08:09:28 UTC (rev 5791)
+++ portal/trunk/packaging/jboss-as6/pkg/package.xml 2011-01-19 19:32:39 UTC (rev 5792)
@@ -41,7 +41,8 @@
preservelastmodified="true" overwrite="true"/>
<!-- File permissions -->
- <chmod perm="0644" type="file" dir="${jbossas.target.dir}" excludes="**/*.sh"/>
+ <!-- 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>
Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-19 08:09:28 UTC (rev 5791)
+++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-01-19 19:32:39 UTC (rev 5792)
@@ -19,11 +19,9 @@
<properties>
<jbossas.version>6.0.0.Final</jbossas.version>
<jbossas.dist.version>${jbossas.version}</jbossas.dist.version>
- <exo.projects.directory.dependencies>${project.basedir}/../../pkg/servers</exo.projects.directory.dependencies>
- <exo.projects.app.jboss.version>jboss-${jbossas.version}</exo.projects.app.jboss.version>
- <servers.dir>${exo.projects.directory.dependencies}</servers.dir>
+ <servers.dir>${project.basedir}/../../pkg/servers</servers.dir>
<jbossas.path>${servers.dir}</jbossas.path>
- <jbossas.name>${exo.projects.app.jboss.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>
<wsrp.version>2.0.0-GA</wsrp.version>
@@ -909,6 +907,19 @@
<build>
<plugins>
<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>
@@ -999,8 +1010,20 @@
</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>
13 years, 3 months
- 1
- 0
gatein SVN: r5791 - epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-01-19 03:09:28 -0500 (Wed, 19 Jan 2011)
New Revision: 5791
Removed:
epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/rh-list.txt
Log:
Committed in error
Deleted: epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/rh-list.txt
===================================================================
--- epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/rh-list.txt 2011-01-19 08:09:05 UTC (rev 5790)
+++ epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/rh-list.txt 2011-01-19 08:09:28 UTC (rev 5791)
@@ -1,48 +0,0 @@
-accept_delete.png
-authhomepage.png
-hidesidebar.png
-printreview.png
-workspacelist.png
-templatetypedropdownbox.png
-newsletters_direct_category_subscription.png
-homepage.png
-manageunlockstab.png
-labellist.png
-detailsview.png
-resourcesleftpanel.png
-imagefolders.png
-newsletters-newsletter_manager.png
-shareddrive.png
-newsletters_newsletter_administration.png
-groupdrive.png
-acme.png
-exosite.png
-confirmdeletion.png
-newsletters_newsletter_administration2.png
-tagdelete.png
-sites_admin.png
-alldrives.png
-sitesmanagementdrive.png
-toolbar.png
-alloweditionmenu.png
-manage_templates_form.png
-removelabelform.png
-skinsetting.png
-searchresults.png
-createactiontypeexecuteform.png
-accountname.png
-accessbanner.png
-startlogo3.png
-publicdrive.png
-sitesexplorer.png
-privatedrive.png
-selectfolders.png
-thumbnailview.png
-JBoss_product_and_documentation_overview.png
-newsletters_category_delete_confirm.png
-selectcategory.png
-manage_taxonomy_trees.png
-startlogo.png
-startlogo2.png
-draggingfolders.png
-categorynavigation.png
13 years, 3 months
- 1
- 0
gatein SVN: r5790 - epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-01-19 03:09:05 -0500 (Wed, 19 Jan 2011)
New Revision: 5790
Removed:
epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/new-rh-list.txt
Log:
Committed in error
Deleted: epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/new-rh-list.txt
===================================================================
--- epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/new-rh-list.txt 2011-01-19 08:08:33 UTC (rev 5789)
+++ epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/new-rh-list.txt 2011-01-19 08:09:05 UTC (rev 5790)
@@ -1,48 +0,0 @@
-accept_delete.png
-accessbanner.png
-accountname.png
-acme.png
-alldrives.png
-alloweditionmenu.png
-authhomepage.png
-categorynavigation.png
-confirmdeletion.png
-createactiontypeexecuteform.png
-detailsview.png
-draggingfolders.png
-exosite.png
-groupdrive.png
-hidesidebar.png
-homepage.png
-imagefolders.png
-JBoss_product_and_documentation_overview.png
-labellist.png
-manage_taxonomy_trees.png
-manage_templates_form.png
-manageunlockstab.png
-newsletters_category_delete_confirm.png
-newsletters_direct_category_subscription.png
-newsletters_newsletter_administration2.png
-newsletters_newsletter_administration.png
-newsletters-newsletter_manager.png
-printreview.png
-privatedrive.png
-publicdrive.png
-removelabelform.png
-resourcesleftpanel.png
-searchresults.png
-selectcategory.png
-selectfolders.png
-shareddrive.png
-sites_admin.png
-sitesexplorer.png
-sitesmanagementdrive.png
-skinsetting.png
-startlogo2.png
-startlogo3.png
-startlogo.png
-tagdelete.png
-templatetypedropdownbox.png
-thumbnailview.png
-toolbar.png
-workspacelist.png
13 years, 3 months
- 1
- 0
gatein SVN: r5789 - epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-01-19 03:08:33 -0500 (Wed, 19 Jan 2011)
New Revision: 5789
Removed:
epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/list.txt
Log:
Committed in error
Deleted: epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/list.txt
===================================================================
--- epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/list.txt 2011-01-19 08:08:01 UTC (rev 5788)
+++ epp/docs/tags/EPP_5_1_0_GA/Site_Publisher/User_Guide/en-US/images/list.txt 2011-01-19 08:08:33 UTC (rev 5789)
@@ -1,48 +0,0 @@
-accept_delete.png
-accessbanner.png
-accountname.png
-acme.png
-alldrives.png
-alloweditionmenu.png
-authhomepage.png
-categorynavigation.png
-confirmdeletion.png
-createactiontypeexecuteform.png
-detailsview.png
-draggingfolders.png
-exosite.png
-groupdrive.png
-hidesidebar.png
-homepage.png
-imagefolders.png
-JBoss_product_and_documentation_overview.png
-labellist.png
-manage_taxonomy_trees.png
-manage_templates_form.png
-manageunlockstab.png
-newsletters_category_delete_confirm.png
-newsletters_direct_category_subscription.png
-newsletters_newsletter_administration2.png
-newsletters_newsletter_administration.png
-newsletters-newsletter_manager.png
-printreview.png
-privatedrive.png
-publicdrive.png
-removelabelform.png
-resourcesleftpanel.png
-searchresults.png
-selectcategory.png
-selectfolders.png
-shareddrive.png
-sites_admin.png
-sitesexplorer.png
-sitesmanagementdrive.png
-skinsetting.png
-startlogo2.png
-startlogo3.png
-startlogo.png
-tagdelete.png
-templatetypedropdownbox.png
-thumbnailview.png
-toolbar.png
-workspacelist.png
13 years, 3 months
- 1
- 0