August 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r11763 - in modules/presentation/trunk: .settings and 3 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-28 14:54:44 -0400 (Thu, 28 Aug 2008) New Revision: 11763 Added: modules/presentation/trunk/.settings/ modules/presentation/trunk/.settings/org.eclipse.jdt.ui.prefs modules/presentation/trunk/.settings/org.maven.ide.eclipse.prefs Modified: modules/presentation/trunk/ modules/presentation/trunk/.classpath modules/presentation/trunk/.project modules/presentation/trunk/ajax/ modules/presentation/trunk/build/ modules/presentation/trunk/portal/ Log: Eclipse files + SVN ignores Property changes on: modules/presentation/trunk ___________________________________________________________________ Name: svn:ignore - bin + bin target Modified: modules/presentation/trunk/.classpath =================================================================== --- modules/presentation/trunk/.classpath 2008-08-28 18:05:44 UTC (rev 11762) +++ modules/presentation/trunk/.classpath 2008-08-28 18:54:44 UTC (rev 11763) @@ -1,110 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="presentation/src/main/java"/> - <classpathentry kind="src" path="presentation/src/test/java"/> - <classpathentry kind="src" path="classic/src/main/java"/> - <classpathentry kind="src" path="classic/src/test/java"/> - <classpathentry kind="src" path="ajax/src/main/java"/> - <classpathentry kind="src" path="ajax/src/test/java"/> + <classpathentry kind="src" output="presentation/target/classes" path="presentation/src/main/java"/> + <classpathentry kind="src" output="presentation/target/test-classes" path="presentation/src/test/java"/> + <classpathentry excluding="**" kind="src" output="presentation/target/classes" path="presentation/src/main/resources"/> + <classpathentry kind="src" output="classic/target/classes" path="classic/src/main/java"/> + <classpathentry kind="src" output="classic/target/test-classes" path="classic/src/test/java"/> + <classpathentry excluding="**" kind="src" output="classic/target/classes" path="classic/src/main/resources"/> + <classpathentry excluding="**" kind="src" output="classic/target/test-classes" path="classic/src/test/resources"/> + <classpathentry kind="src" output="ajax/target/classes" path="ajax/src/main/java"/> + <classpathentry kind="src" output="ajax/target/test-classes" path="ajax/src/test/java"/> + <classpathentry excluding="**" kind="src" output="ajax/target/classes" path="ajax/src/main/resources"/> + <classpathentry excluding="**" kind="src" output="ajax/target/test-classes" path="ajax/src/test/resources"/> + <classpathentry kind="src" output="portal/target/classes" path="portal/src/main/java"/> + <classpathentry kind="src" output="portal/target/test-classes" path="portal/src/test/java"/> + <classpathentry excluding="**" kind="src" output="portal/target/classes" path="portal/src/main/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/> - <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/> - <classpathentry kind="var" path="M2_REPO/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/> - <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-tomcat/catalina/5.5.12/catalina-5.5.12.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/ccpp/ccpp/1.0/ccpp-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-common/1.2.0-SNAPSHOT/common-common-1.2.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-mc/1.2.0.Beta3/common-mc-1.2.0.Beta3.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-portal/1.2.0.Beta3/common-portal-1.2.0.Beta3.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> - <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> - <classpathentry kind="var" path="M2_REPO/cargo/core/0.9-portal/core-0.9-portal.jar"/> - <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> - <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/1.4.60/gwt-user-1.4.60.jar"/> - <classpathentry kind="var" path="M2_REPO/hibernate/hibernate3/3.2.3.GA/hibernate3-3.2.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.4/jaxb-api-2.1.4.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.0.Beta9/jboss-aop-mc-int-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-classloader/2.0.0.Beta9/jboss-classloader-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.3.GA/jboss-common-core-2.0.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta9/jboss-dependency-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-client/2.0.0.Beta9/jboss-deployers-client-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-client-spi/2.0.0.Beta9/jboss-deployers-client-spi-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-core/2.0.0.Beta9/jboss-deployers-core-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-core-spi/2.0.0.Beta9/jboss-deployers-core-spi-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-impl/2.0.0.Beta9/jboss-deployers-impl-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-spi/2.0.0.Beta9/jboss-deployers-spi-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-structure-spi/2.0.0.Beta9/jboss-deployers-structure-spi-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-vfs/2.0.0.Beta9/jboss-deployers-vfs-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-deployers-vfs-spi/2.0.0.Beta9/jboss-deployers-vfs-spi-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-j2ee/4.2.0.GA/jboss-j2ee-4.2.0.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.0.GA/jboss-jmx-4.2.0.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta9/jboss-kernel-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-local-jdbc/4.0.4.GA/jboss-local-jdbc-4.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-jdk/2.0.3.GA/jboss-logging-jdk-2.0.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.3.GA/jboss-logging-log4j-2.0.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-metatype/2.0.0.Beta9/jboss-metatype-2.0.0.Beta9.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-remoting/2.2.1.GA/jboss-remoting-2.2.1.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.0.GA/jboss-system-4.2.0.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit/1.2.0.SNAPSHOT/jboss-unit-1.2.0.SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-mc/1.2.0.SNAPSHOT/jboss-unit-mc-1.2.0.SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-remote/1.2.0.SNAPSHOT/jboss-unit-remote-1.2.0.SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-ant/1.2.0.SNAPSHOT/jboss-unit-tooling-ant-1.2.0.SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-core/1.2.0.SNAPSHOT/jboss-unit-tooling-core-1.2.0.SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta6/jboss-vfs-2.0.0.Beta6.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-taglibs/jstl/1.1.2/jstl-1.1.2.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.8/log4j-1.2.8.jar"/> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/> - <classpathentry kind="var" path="M2_REPO/net/mygwt/mygwt/0.3.0/mygwt-0.3.0.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-opends/opends-core/legacy/opends-core-legacy.jar"/> - <classpathentry kind="var" path="M2_REPO/org/osgi/osgi_R4_core/1.0/osgi_R4_core-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/unit/portal-test/1.2.0.Beta2/portal-test-1.2.0.Beta2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/unit/portal-test-generic/1.2.0.Beta2/portal-test-generic-1.2.0.Beta2.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/portlet/portlet-api/2.0/portlet-api-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/portlet/portlet-controller/2.0.0.CR1/portlet-controller-2.0.0.CR1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/portlet/portlet-jsr168api/2.0.0.CR1/portlet-jsr168api-2.0.0.CR1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/portlet/portlet-mc/2.0.0.CR1/portlet-mc-2.0.0.CR1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/portlet/portlet-portal/2.0.0.CR1/portlet-portal-2.0.0.CR1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/portlet/portlet-portlet/2.0.0.CR1/portlet-portlet-2.0.0.CR1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/portlet/portlet-portlet/2.0.0.CR1/portlet-portlet-2.0.0.CR1-tests.jar"/> - <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-taglibs/standard/1.1.2/standard-1.1.2.jar"/> - <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/portal/web/web-web/1.2.0-SNAPSHOT/web-web-1.2.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/> - <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/> - <classpathentry kind="var" path="M2_REPO/httpunit/httpunit/1.6/httpunit-1.6.jar"/> - <classpathentry kind="output" path="bin/classes"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> </classpath> Modified: modules/presentation/trunk/.project =================================================================== --- modules/presentation/trunk/.project 2008-08-28 18:05:44 UTC (rev 11762) +++ modules/presentation/trunk/.project 2008-08-28 18:54:44 UTC (rev 11763) @@ -1,13 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>presentation</name> - <comment>JBoss Portal Presentation Module</comment> - <projects/> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> \ No newline at end of file + <name>module-presentation</name> + <comment>JBoss Portal Presentation Module</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Added: modules/presentation/trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- modules/presentation/trunk/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ modules/presentation/trunk/.settings/org.eclipse.jdt.ui.prefs 2008-08-28 18:54:44 UTC (rev 11763) @@ -0,0 +1,3 @@ +#Thu Aug 28 20:48:50 CEST 2008 +eclipse.preferences.version=1 +internal.default.compliance=user Added: modules/presentation/trunk/.settings/org.maven.ide.eclipse.prefs =================================================================== --- modules/presentation/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ modules/presentation/trunk/.settings/org.maven.ide.eclipse.prefs 2008-08-28 18:54:44 UTC (rev 11763) @@ -0,0 +1,8 @@ +#Thu Aug 28 20:43:54 CEST 2008 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=true +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +version=1 Property changes on: modules/presentation/trunk/ajax ___________________________________________________________________ Name: svn:ignore + target Property changes on: modules/presentation/trunk/build ___________________________________________________________________ Name: svn:ignore + target Property changes on: modules/presentation/trunk/portal ___________________________________________________________________ Name: svn:ignore + target

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11762 - branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-28 14:05:44 -0400 (Thu, 28 Aug 2008) New Revision: 11762 Modified: branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java Log: Fix testcase (for real) Modified: branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java 2008-08-28 15:35:20 UTC (rev 11761) +++ branches/JBoss_Portal_Branch_2_7/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java 2008-08-28 18:05:44 UTC (rev 11762) @@ -43,7 +43,7 @@ public void test02() throws Exception { NetvibesQuery q = new NetvibesQuery(1, 11, "5", "foo", "bar"); - assertEquals("http://api.eco.netvibes.com/search/?type=uwa&limit=11&category=5&sort=foo...", q.buildQueryURL().toString()); + assertEquals("http://api.eco.netvibes.com/search/?type=uwa&page=1&limit=11&category=5&s...", q.buildQueryURL().toString()); } public void test03()

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11761 - in modules/cms/trunk/cms-jackrabbit: src/test/java/org/jboss/portal/cms/test/commands and 1 other directory.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2008-08-28 11:35:20 -0400 (Thu, 28 Aug 2008) New Revision: 11761 Modified: modules/cms/trunk/cms-jackrabbit/ modules/cms/trunk/cms-jackrabbit/installLocalDependencies.sh modules/cms/trunk/cms-jackrabbit/pom.xml modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/AbstractCommandTestCase.java Log: cleanup/localDependency (hack) [should be resolved once the artifacts are available and/or located in the remote repositories] Property changes on: modules/cms/trunk/cms-jackrabbit ___________________________________________________________________ Name: svn:ignore + repotest repotest-hsqldb target test.properties test.script Modified: modules/cms/trunk/cms-jackrabbit/installLocalDependencies.sh =================================================================== --- modules/cms/trunk/cms-jackrabbit/installLocalDependencies.sh 2008-08-28 15:14:36 UTC (rev 11760) +++ modules/cms/trunk/cms-jackrabbit/installLocalDependencies.sh 2008-08-28 15:35:20 UTC (rev 11761) @@ -9,4 +9,19 @@ mvn install:install-file -DgroupId=local -DartifactId=portal-test-lib -Dversion=2.7 -Dpackaging=jar -Dfile=local/jboss-portal/2.7/portal-test-lib.jar mvn install:install-file -DgroupId=local -DartifactId=jbpm-identity -Dversion=3.2.GA -Dpackaging=jar -Dfile=local/jbpm/3.2.GA/jbpm-identity.jar -mvn install:install-file -DgroupId=local -DartifactId=jbpm-jpdl -Dversion=3.2.GA -Dpackaging=jar -Dfile=local/jbpm/3.2.GA/jbpm-jpdl.jar \ No newline at end of file +mvn install:install-file -DgroupId=local -DartifactId=jbpm-jpdl -Dversion=3.2.GA -Dpackaging=jar -Dfile=local/jbpm/3.2.GA/jbpm-jpdl.jar + +mvn install:install-file -DgroupId=local -DartifactId=jboss -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-common -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-common.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-common-jdbc-wrapper -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-common-jdbc-wrapper.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-container -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-container.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-dependency -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-dependency.jar +mvn install:install-file -DgroupId=local -DartifactId=jbossha -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jbossha.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-jca -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-jca.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-local-jdbc -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-local-jdbc.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-microcontainer -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-microcontainer.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-system -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-system.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-transaction -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-transaction.jar +mvn install:install-file -DgroupId=local -DartifactId=jboss-xml-binding -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jboss-xml-binding.jar +mvn install:install-file -DgroupId=local -DartifactId=jnp-client -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jnp-client.jar +mvn install:install-file -DgroupId=local -DartifactId=jnpserver -Dversion=4.0.4.GA -Dpackaging=jar -Dfile=local/jnpserver.jar Modified: modules/cms/trunk/cms-jackrabbit/pom.xml =================================================================== --- modules/cms/trunk/cms-jackrabbit/pom.xml 2008-08-28 15:14:36 UTC (rev 11760) +++ modules/cms/trunk/cms-jackrabbit/pom.xml 2008-08-28 15:35:20 UTC (rev 11761) @@ -274,14 +274,16 @@ <excludes> <exclude>**/TestJackRabbitFirstHop.java</exclude> <exclude>**/TestFileCreateFailed$1TestCommand.java</exclude> -  + <exclude>**/TestSearch.java</exclude> <exclude>**/TestReadAccess.java</exclude> <exclude>**/TestWriteAccess.java</exclude> <exclude>**/TestManageAccess.java</exclude> - </excludes> + </excludes> +  </configuration> </plugin> <plugin> Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/AbstractCommandTestCase.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/AbstractCommandTestCase.java 2008-08-28 15:14:36 UTC (rev 11760) +++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/AbstractCommandTestCase.java 2008-08-28 15:35:20 UTC (rev 11761) @@ -62,7 +62,7 @@ service = new JCRCMS(); service.setDoChecking(true); service.setDefaultLocale(Locale.ENGLISH.getDisplayName()); - service.setDefaultContentLocation("target/classes/default-content/default"); + service.setDefaultContentLocation("default-content/default"); service.setConfig(config.getDocumentElement()); service.setRepositoryName("repo");

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11760 - in modules/cms/trunk: cms-jackrabbit and 1 other directory.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2008-08-28 11:14:36 -0400 (Thu, 28 Aug 2008) New Revision: 11760 Removed: modules/cms/trunk/cms-jackrabbit/repotest-hsqldb/ modules/cms/trunk/cms-jackrabbit/test.log modules/cms/trunk/cms-jackrabbit/test.properties modules/cms/trunk/cms-jackrabbit/test.script Modified: modules/cms/trunk/ Log: cleanup Property changes on: modules/cms/trunk ___________________________________________________________________ Name: svn:ignore + bin Deleted: modules/cms/trunk/cms-jackrabbit/test.log =================================================================== --- modules/cms/trunk/cms-jackrabbit/test.log 2008-08-28 15:10:18 UTC (rev 11759) +++ modules/cms/trunk/cms-jackrabbit/test.log 2008-08-28 15:14:36 UTC (rev 11760) @@ -1,128 +0,0 @@ -/*C1*/SET SCHEMA PUBLIC -CONNECT USER SA -drop table jbp_cms_cmsentry if exists -drop table jbp_cms_perm if exists -drop table jbp_cms_perm_criteria if exists -drop table jbp_cms_perm_role if exists -drop table jbp_cms_perm_user if exists -drop table jbp_cms_repositoryentry if exists -drop table jbp_cms_version_binval if exists -drop table jbp_cms_version_node if exists -drop table jbp_cms_version_prop if exists -drop table jbp_cms_version_refs if exists -drop table jbp_cms_versionentry if exists -drop table jbp_cms_wsp_binval if exists -drop table jbp_cms_wsp_node if exists -drop table jbp_cms_wsp_prop if exists -drop table jbp_cms_wsp_refs if exists -create table jbp_cms_cmsentry (PK integer generated by default as identity (start with 1), FSENTRY_NAME varchar(255), FSENTRY_PATH varchar(245) not null, FSENTRY_DATA longvarbinary, FSENTRY_LASTMOD bigint not null, FSENTRY_LENGTH bigint not null, primary key (PK)) -create table jbp_cms_perm (ID bigint generated by default as identity (start with 1), NAME varchar(255) not null, ACTION varchar(255) not null, NEGATED bit not null, primary key (ID)) -create table jbp_cms_perm_criteria (ID bigint generated by default as identity (start with 1), NAME varchar(255) not null, VALUE varchar(255) not null, CMS_PERM_ID bigint, primary key (ID)) -create table jbp_cms_perm_role (ID bigint generated by default as identity (start with 1), ROLE_ID varchar(255) not null, CMS_PERM_ID bigint, primary key (ID)) -create table jbp_cms_perm_user (ID bigint generated by default as identity (start with 1), USER_ID varchar(255) not null, CMS_PERM_ID bigint, primary key (ID)) -create table jbp_cms_repositoryentry (PK integer generated by default as identity (start with 1), FSENTRY_NAME varchar(255), FSENTRY_PATH varchar(245) not null, FSENTRY_DATA longvarbinary, FSENTRY_LASTMOD bigint not null, FSENTRY_LENGTH bigint not null, primary key (PK)) -create table jbp_cms_version_binval (PK integer generated by default as identity (start with 1), BINVAL_ID varchar(255), BINVAL_DATA longvarbinary not null, primary key (PK)) -create table jbp_cms_version_node (PK integer generated by default as identity (start with 1), NODE_ID varchar(36), NODE_DATA varbinary(100000000) not null, primary key (PK)) -create table jbp_cms_version_prop (PK integer generated by default as identity (start with 1), PROP_ID varchar(255), PROP_DATA varbinary(100000000) not null, primary key (PK)) -create table jbp_cms_version_refs (PK integer generated by default as identity (start with 1), NODE_ID varchar(36), REFS_DATA varbinary(100000000) not null, primary key (PK)) -create table jbp_cms_versionentry (PK integer generated by default as identity (start with 1), FSENTRY_NAME varchar(255), FSENTRY_PATH varchar(245) not null, FSENTRY_DATA longvarbinary, FSENTRY_LASTMOD bigint not null, FSENTRY_LENGTH bigint not null, primary key (PK)) -create table jbp_cms_wsp_binval (PK integer generated by default as identity (start with 1), BINVAL_ID varchar(255), BINVAL_DATA longvarbinary not null, primary key (PK)) -create table jbp_cms_wsp_node (PK integer generated by default as identity (start with 1), NODE_ID varchar(36), NODE_DATA varbinary(100000000) not null, primary key (PK)) -create table jbp_cms_wsp_prop (PK integer generated by default as identity (start with 1), PROP_ID varchar(255), PROP_DATA varbinary(100000000) not null, primary key (PK)) -create table jbp_cms_wsp_refs (PK integer generated by default as identity (start with 1), NODE_ID varchar(36), REFS_DATA varbinary(100000000) not null, primary key (PK)) -alter table jbp_cms_perm_criteria add constraint FK68E7311125269C4B foreign key (CMS_PERM_ID) references jbp_cms_perm -alter table jbp_cms_perm_role add constraint FK16837B2825269C4B foreign key (CMS_PERM_ID) references jbp_cms_perm -alter table jbp_cms_perm_user add constraint FK1684E67D25269C4B foreign key (CMS_PERM_ID) references jbp_cms_perm -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_CMSENTRY VALUES(1,'','/',NULL,1219893733884,0) -COMMIT -INSERT INTO JBP_CMS_CMSENTRY VALUES(2,'meta','/',NULL,1219893733914,0) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_CMSENTRY VALUES(3,'rootUUID','/meta','63616665626162652d636166652d626162652d636166652d626162656361666562616265',1219893733940,36) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_CMSENTRY VALUES(4,'rep.properties','/meta','23576564204175672032372032333a32323a31332045445420323030380a6f7074696f6e2e76657273696f6e696e672e737570706f727465643d747275650a6a63722e7265706f7369746f72792e76657273696f6e3d312e342e350a6a63722e7265706f7369746f72792e6e616d653d4a61636b7261626269740a6f7074696f6e2e6f62736572766174696f6e2e737570706f727465643d747275650a6f7074696f6e2e6c6f636b696e672e737570706f727465643d747275650a6f7074696f6e2e7472616e73616374696f6e732e737570706f727465643d747275650a6a63722e7265706f7369746f72792e73746174732e6e6f6465732e636f756e743d300a6f7074696f6e2e71756572792e73716c2e737570706f727465643d747275650a6c6576656c2e322e737570706f727465643d747275650a6a63722e73706563696669636174696f6e2e6e616d653d436f6e74656e74205265706f7369746f72792041504920666f72204a61766128544d2920546563686e6f6c6f67792053706563696669636174696f6e0a6a63722e7265706f7369746f72792e73746174732e70726f706572746965732e636f756e743d300a6c6576656c2e312e737570706f727465643d747275650a6a6372! 2e73706563696669636174696f6e2e76657273696f6e3d312e300a6a63722e7265706f7369746f72792e76656e646f723d41706163686520536f66747761726520466f756e646174696f6e0a71756572792e78706174682e646f632e6f726465723d747275650a71756572792e78706174682e706f732e696e6465783d747275650a6a63722e7265706f7369746f72792e76656e646f722e75726c3d687474705c3a2f2f6a61636b7261626269742e6170616368652e6f72672f0a',1219893733952,649) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_CMSENTRY VALUES(5,'namespaces','/',NULL,1219893733963,0) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_CMSENTRY VALUES(6,'ns_reg.properties','/namespaces','23576564204175672032372032333a32323a31332045445420323030380a6a63723d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e300a73763d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e300a786d6c3d687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163650a6e743d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e300a6d69783d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e300a7265703d696e7465726e616c0a3d0a',1219893733969,223) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_CMSENTRY VALUES(7,'ns_idx.properties','/namespaces','23576564204175672032372032333a32323a31332045445420323030380a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e303d330a696e7465726e616c3d320a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e303d360a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e303d350a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e303d340a3d310a687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163653d370a',1219893733977,214) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_CMSENTRY VALUES(8,'nodetypes','/',NULL,1219893733993,0) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_VERSION_NODE VALUES(1,'deadbeef-face-babe-cafe-babecafebabe','00187b696e7465726e616c7d76657273696f6e53746f72616765deadbeefcafebabecafebabecafebabe000a313939343139353435310000000000000000000100277b687474703a2f2f7777772e6a63702e6f72672f6a63722f312e307d7072696d6172795479706500000000') -INSERT INTO JBP_CMS_VERSION_PROP VALUES(1,'deadbeef-face-babe-cafe-babecafebabe/{http://www.jcp.org/jcr/1.0}primaryType','0000000700000a31323636363637313430000000000001000000187b696e7465726e616c7d76657273696f6e53746f72616765') -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_WSP_NODE VALUES(1,'cafebabe-cafe-babe-cafe-babecafebabe','000e7b696e7465726e616c7d726f6f7400000000000000000000000000000000000b2d313533373433363032340000000000000000000100277b687474703a2f2f7777772e6a63702e6f72672f6a63722f312e307d7072696d617279547970650000000100227b687474703a2f2f7777772e6a63702e6f72672f6a63722f312e307d73797374656ddeadbeefcafebabecafebabecafebabe') -INSERT INTO JBP_CMS_WSP_PROP VALUES(1,'cafebabe-cafe-babe-cafe-babecafebabe/{http://www.jcp.org/jcr/1.0}primaryType','0000000700000a313236363636373134300000000000010000000e7b696e7465726e616c7d726f6f74') -INSERT INTO JBP_CMS_WSP_NODE VALUES(2,'deadbeef-cafe-babe-cafe-babecafebabe','00107b696e7465726e616c7d73797374656dcafebabecafebabecafebabecafebabe000b2d313937313934353839380000000000000000000100277b687474703a2f2f7777772e6a63702e6f72672f6a63722f312e307d7072696d6172795479706500000002002a7b687474703a2f2f7777772e6a63702e6f72672f6a63722f312e307d76657273696f6e53746f72616765deadbeeffacebabecafebabecafebabe00257b687474703a2f2f7777772e6a63702e6f72672f6a63722f312e307d6e6f64655479706573deadbeefcafecafecafebabecafebabe') -INSERT INTO JBP_CMS_WSP_PROP VALUES(2,'deadbeef-cafe-babe-cafe-babecafebabe/{http://www.jcp.org/jcr/1.0}primaryType','0000000700000a31323636363637313430000000000001000000107b696e7465726e616c7d73797374656d') -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=6 -INSERT INTO JBP_CMS_CMSENTRY VALUES(6,'ns_reg.properties','/namespaces','23576564204175672032372032333a32323a31362045445420323030380a6a63723d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e300a73763d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e300a786d6c3d687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163650a78733d687474705c3a2f2f7777772e77332e6f72672f323030312f584d4c536368656d610a6e743d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e300a6d69783d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e300a7265703d696e7465726e616c0a3d0a',1219893736726,260) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=7 -INSERT INTO JBP_CMS_CMSENTRY VALUES(7,'ns_idx.properties','/namespaces','23576564204175672032372032333a32323a31362045445420323030380a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e303d330a696e7465726e616c3d320a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e303d360a687474705c3a2f2f7777772e77332e6f72672f323030312f584d4c536368656d613d380a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e303d350a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e303d340a3d310a687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163653d370a',1219893736740,250) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=6 -INSERT INTO JBP_CMS_CMSENTRY VALUES(6,'ns_reg.properties','/namespaces','23576564204175672032372032333a32323a31362045445420323030380a666e5f6f6c643d687474705c3a2f2f7777772e77332e6f72672f323030342f31302f78706174682d66756e6374696f6e730a78733d687474705c3a2f2f7777772e77332e6f72672f323030312f584d4c536368656d610a786d6c3d687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163650a6a63723d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e300a6e743d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e300a7265703d696e7465726e616c0a73763d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e300a6d69783d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e300a3d0a',1219893736748,310) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=7 -INSERT INTO JBP_CMS_CMSENTRY VALUES(7,'ns_idx.properties','/namespaces','23576564204175672032372032333a32323a31362045445420323030380a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e303d330a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e303d350a696e7465726e616c3d320a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e303d340a687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163653d370a687474705c3a2f2f7777772e77332e6f72672f323030312f584d4c536368656d613d380a687474705c3a2f2f7777772e77332e6f72672f323030342f31302f78706174682d66756e6374696f6e733d390a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e303d360a3d310a',1219893736755,295) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=6 -INSERT INTO JBP_CMS_CMSENTRY VALUES(6,'ns_reg.properties','/namespaces','23576564204175672032372032333a32323a31362045445420323030380a666e5f6f6c643d687474705c3a2f2f7777772e77332e6f72672f323030342f31302f78706174682d66756e6374696f6e730a78733d687474705c3a2f2f7777772e77332e6f72672f323030312f584d4c536368656d610a786d6c3d687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163650a6a63723d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e300a6e743d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e300a666e3d687474705c3a2f2f7777772e77332e6f72672f323030352f78706174682d66756e6374696f6e730a7265703d696e7465726e616c0a73763d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e300a6d69783d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e300a3d0a',1219893736763,353) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=7 -INSERT INTO JBP_CMS_CMSENTRY VALUES(7,'ns_idx.properties','/namespaces','23576564204175672032372032333a32323a31362045445420323030380a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e303d330a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e303d350a696e7465726e616c3d320a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e303d340a687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163653d370a687474705c3a2f2f7777772e77332e6f72672f323030352f78706174682d66756e6374696f6e733d31300a687474705c3a2f2f7777772e77332e6f72672f323030312f584d4c536368656d613d380a687474705c3a2f2f7777772e77332e6f72672f323030342f31302f78706174682d66756e6374696f6e733d390a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e303d360a3d310a',1219893736770,338) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=6 -INSERT INTO JBP_CMS_CMSENTRY VALUES(6,'ns_reg.properties','/namespaces','23576564204175672032372032333a32323a31362045445420323030380a666e5f6f6c643d687474705c3a2f2f7777772e77332e6f72672f323030342f31302f78706174682d66756e6374696f6e730a78733d687474705c3a2f2f7777772e77332e6f72672f323030312f584d4c536368656d610a786d6c3d687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163650a6a63723d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e300a6e743d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e300a666e3d687474705c3a2f2f7777772e77332e6f72672f323030352f78706174682d66756e6374696f6e730a7265703d696e7465726e616c0a73763d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e300a6d69783d687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e300a706f7274616c636d733d687474705c3a2f2f6a626f73732e6f72672f6a63722f706f7274616c636d730a3d0a',1219893736983,395) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=7 -INSERT INTO JBP_CMS_CMSENTRY VALUES(7,'ns_idx.properties','/namespaces','23576564204175672032372032333a32323a31362045445420323030380a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f312e303d330a696e7465726e616c3d320a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e303d350a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e303d340a687474705c3a2f2f7777772e77332e6f72672f584d4c2f313939382f6e616d6573706163653d370a687474705c3a2f2f7777772e77332e6f72672f323030352f78706174682d66756e6374696f6e733d31300a687474705c3a2f2f7777772e77332e6f72672f323030312f584d4c536368656d613d380a687474705c3a2f2f6a626f73732e6f72672f6a63722f706f7274616c636d733d31310a687474705c3a2f2f7777772e77332e6f72672f323030342f31302f78706174682d66756e6374696f6e733d390a687474705c3a2f2f7777772e6a63702e6f72672f6a63722f73762f312e303d360a3d310a',1219893737046,373) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -INSERT INTO JBP_CMS_CMSENTRY VALUES(9,'custom_nodetypes.xml','/nodetypes','3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c6e6f6465547970657320786d6c6e733a666e3d22687474703a2f2f7777772e77332e6f72672f323030352f78706174682d66756e6374696f6e732220786d6c6e733a666e5f6f6c643d22687474703a2f2f7777772e77332e6f72672f323030342f31302f78706174682d66756e6374696f6e732220786d6c6e733a6a63723d22687474703a2f2f7777772e6a63702e6f72672f6a63722f312e302220786d6c6e733a6d69783d22687474703a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e302220786d6c6e733a6e743d22687474703a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e302220786d6c6e733a706f7274616c636d733d22687474703a2f2f6a626f73732e6f72672f6a63722f706f7274616c636d732220786d6c6e733a7265703d22696e7465726e616c2220786d6c6e733a73763d22687474703a2f2f7777772e6a63702e6f72672f6a63722f73762f312e302220786d6c6e733a78733d22687474703a2f2f7777772e77332e6f72672f323030312f584d4c536368656d61223e3c6e6f646554797065206861734f7264657261626c654! 368696c644e6f6465733d2266616c7365222069734d6978696e3d2266616c736522206e616d653d22706f7274616c636d733a666f6c64657222207072696d6172794974656d4e616d653d22223e3c737570657274797065733e3c7375706572747970653e6e743a6869657261726368794e6f64653c2f7375706572747970653e3c2f737570657274797065733e3c70726f7065727479446566696e6974696f6e206175746f437265617465643d2266616c736522206d616e6461746f72793d2266616c736522206d756c7469706c653d2266616c736522206e616d653d222a22206f6e506172656e7456657273696f6e3d22434f5059222070726f7465637465643d2266616c736522207265717569726564547970653d22756e646566696e6564222f3e3c6368696c644e6f6465446566696e6974696f6e206175746f437265617465643d2266616c7365222064656661756c745072696d617279547970653d2222206d616e6461746f72793d2266616c736522206e616d653d222a22206f6e506172656e7456657273696f6e3d2256455253494f4e222070726f7465637465643d2266616c7365222073616d654e616d655369626c696e67733d2274727565223e3c72657175697265645072696d61727954797065733e3c72657175697265645072696d617279547970653e6! e743a6869657261726368794e6f64653c2f72657175697265645072696d61727954797 0653e3c2f72657175697265645072696d61727954797065733e3c2f6368696c644e6f6465446566696e6974696f6e3e3c2f6e6f6465547970653e3c2f6e6f646554797065733e',1219893737080,1056) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=9 -INSERT INTO JBP_CMS_CMSENTRY VALUES(9,'custom_nodetypes.xml','/nodetypes','3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c6e6f6465547970657320786d6c6e733a666e3d22687474703a2f2f7777772e77332e6f72672f323030352f78706174682d66756e6374696f6e732220786d6c6e733a666e5f6f6c643d22687474703a2f2f7777772e77332e6f72672f323030342f31302f78706174682d66756e6374696f6e732220786d6c6e733a6a63723d22687474703a2f2f7777772e6a63702e6f72672f6a63722f312e302220786d6c6e733a6d69783d22687474703a2f2f7777772e6a63702e6f72672f6a63722f6d69782f312e302220786d6c6e733a6e743d22687474703a2f2f7777772e6a63702e6f72672f6a63722f6e742f312e302220786d6c6e733a706f7274616c636d733d22687474703a2f2f6a626f73732e6f72672f6a63722f706f7274616c636d732220786d6c6e733a7265703d22696e7465726e616c2220786d6c6e733a73763d22687474703a2f2f7777772e6a63702e6f72672f6a63722f73762f312e302220786d6c6e733a78733d22687474703a2f2f7777772e77332e6f72672f323030312f584d4c536368656d61223e3c6e6f646554797065206861734f7264657261626c654! 368696c644e6f6465733d2266616c7365222069734d6978696e3d2266616c736522206e616d653d22706f7274616c636d733a66696c6522207072696d6172794974656d4e616d653d22223e3c737570657274797065733e3c7375706572747970653e6e743a6869657261726368794e6f64653c2f7375706572747970653e3c2f737570657274797065733e3c70726f7065727479446566696e6974696f6e206175746f437265617465643d2266616c736522206d616e6461746f72793d2266616c736522206d756c7469706c653d2266616c736522206e616d653d222a22206f6e506172656e7456657273696f6e3d22434f5059222070726f7465637465643d2266616c736522207265717569726564547970653d22756e646566696e6564222f3e3c6368696c644e6f6465446566696e6974696f6e206175746f437265617465643d2266616c7365222064656661756c745072696d617279547970653d2222206d616e6461746f72793d2266616c736522206e616d653d222a22206f6e506172656e7456657273696f6e3d2256455253494f4e222070726f7465637465643d2266616c7365222073616d654e616d655369626c696e67733d2274727565223e3c72657175697265645072696d61727954797065733e3c72657175697265645072696d617279547970653e6e743! a6869657261726368794e6f64653c2f72657175697265645072696d617279547970653 e3c2f72657175697265645072696d61727954797065733e3c2f6368696c644e6f6465446566696e6974696f6e3e3c2f6e6f6465547970653e3c6e6f646554797065206861734f7264657261626c654368696c644e6f6465733d2266616c7365222069734d6978696e3d2266616c736522206e616d653d22706f7274616c636d733a666f6c64657222207072696d6172794974656d4e616d653d22223e3c737570657274797065733e3c7375706572747970653e6e743a6869657261726368794e6f64653c2f7375706572747970653e3c2f737570657274797065733e3c70726f7065727479446566696e6974696f6e206175746f437265617465643d2266616c736522206d616e6461746f72793d2266616c736522206d756c7469706c653d2266616c736522206e616d653d222a22206f6e506172656e7456657273696f6e3d22434f5059222070726f7465637465643d2266616c736522207265717569726564547970653d22756e646566696e6564222f3e3c6368696c644e6f6465446566696e6974696f6e206175746f437265617465643d2266616c7365222064656661756c745072696d617279547970653d2222206d616e6461746f72793d2266616c736522206e616d653d222a22206f6e506172656e7456657273696f6e3d2256455253494f4e222070726f74656374! 65643d2266616c7365222073616d654e616d655369626c696e67733d2274727565223e3c72657175697265645072696d61727954797065733e3c72657175697265645072696d617279547970653e6e743a6869657261726368794e6f64653c2f72657175697265645072696d617279547970653e3c2f72657175697265645072696d61727954797065733e3c2f6368696c644e6f6465446566696e6974696f6e3e3c2f6e6f6465547970653e3c2f6e6f646554797065733e',1219893737429,1664) -COMMIT -SET AUTOCOMMIT TRUE -SET AUTOCOMMIT FALSE -DELETE FROM JBP_CMS_CMSENTRY WHERE PK=9 Deleted: modules/cms/trunk/cms-jackrabbit/test.properties =================================================================== --- modules/cms/trunk/cms-jackrabbit/test.properties 2008-08-28 15:10:18 UTC (rev 11759) +++ modules/cms/trunk/cms-jackrabbit/test.properties 2008-08-28 15:14:36 UTC (rev 11760) @@ -1,17 +0,0 @@ -#HSQL Database Engine -#Wed Aug 27 23:22:12 EDT 2008 -hsqldb.script_format=0 -runtime.gc_interval=0 -sql.enforce_strict_size=false -hsqldb.cache_size_scale=8 -readonly=false -hsqldb.nio_data_file=true -hsqldb.cache_scale=14 -version=1.8.0 -hsqldb.default_table_type=memory -hsqldb.cache_file_scale=1 -hsqldb.log_size=200 -modified=yes -hsqldb.cache_version=1.7.0 -hsqldb.original_version=1.8.0 -hsqldb.compatible_version=1.8.0 Deleted: modules/cms/trunk/cms-jackrabbit/test.script =================================================================== --- modules/cms/trunk/cms-jackrabbit/test.script 2008-08-28 15:10:18 UTC (rev 11759) +++ modules/cms/trunk/cms-jackrabbit/test.script 2008-08-28 15:14:36 UTC (rev 11760) @@ -1,4 +0,0 @@ -CREATE SCHEMA PUBLIC AUTHORIZATION DBA -CREATE USER SA PASSWORD "" -GRANT DBA TO SA -SET WRITE_DELAY 20

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11759 - modules/cms/trunk.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2008-08-28 11:10:18 -0400 (Thu, 28 Aug 2008) New Revision: 11759 Removed: modules/cms/trunk/bin/ Log: cleanup

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11757 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-28 09:29:36 -0400 (Thu, 28 Aug 2008) New Revision: 11757 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java Log: JBPORTAL-2093: Refresh problem with removing a property at page-window level in admin Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2008-08-28 13:12:35 UTC (rev 11756) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2008-08-28 13:29:36 UTC (rev 11757) @@ -99,7 +99,7 @@ { Map pmap = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); String name = (String)pmap.get("name"); - ((PortalObjectImpl)pomgr.getSelectedObject()).getDeclaredPropertyMap().remove(name); + ((PortalObjectImpl)pomgr.getSelectedObject()).setDeclaredProperty(name, null); } public void updateProperty()

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11756 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-08-28 09:12:35 -0400 (Thu, 28 Aug 2008) New Revision: 11756 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteCoordination.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml Log: - Introduced CoordinationType and CoordinationBean for better generic management of some operations. "My plan is sheer elegance in its simplicity!" Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-28 11:12:43 UTC (rev 11755) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-08-28 13:12:35 UTC (rev 11756) @@ -39,7 +39,10 @@ import org.jboss.portal.portlet.info.PortletInfo; import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; import java.util.Collection; +import java.util.Locale; +import java.util.ResourceBundle; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -56,6 +59,62 @@ private EventWiringManagerBean eventManager; private WindowBindingManagerBean windowManager; + // Handle selections for deletion and renaming + private static final String RESOURCE_NAME = "Resource"; + private static final String SELECTED_NAME = "name"; + private static final String SELECTED_TYPE = "type"; + private String selectedName; + private CoordinationType selectedType; + private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>(); + private static ThreadLocal<WindowBindingManagerBean> windowManagerHolder = new ThreadLocal<WindowBindingManagerBean>(); + + private enum CoordinationType + { + wiring() { + String localizationKey() + { + return "COORDINATION_WIRING"; + } + CoordinationBean bean() + { + return eventManagerHolder.get(); + }}, + parameter() { + String localizationKey() + { + return "COORDINATION_PARAMETER"; + } + CoordinationBean bean() + { + return windowManagerHolder.get(); + }}; + abstract String localizationKey(); + abstract CoordinationBean bean(); + } + + abstract static class CoordinationBean + { + protected CoordinationManagerBean managerBean; + + public CoordinationManagerBean getManagerBean() + { + return managerBean; + } + + public void setManagerBean(CoordinationManagerBean managerBean) + { + this.managerBean = managerBean; + } + + public abstract void loadInfoFrom(Page page); + + public abstract String delete(String name) throws IllegalCoordinationException; + + public abstract String rename(String name); + + public abstract void extractInfoFrom(Window window, PortletInfo info); + } + public PortalObjectId getSelectedObjectId() { //since this backing bean is in session, always check for new object request @@ -193,8 +252,8 @@ // Extract metadata only on window children and only if needed if (isExplicitEventsUsed() || isExplicitParametersUsed()) { - eventManager.loadEventWirings(selectedPage); - windowManager.loadWindowBindings(selectedPage); + eventManager.loadInfoFrom(selectedPage); + windowManager.loadInfoFrom(selectedPage); Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK); if (!children.isEmpty()) @@ -250,9 +309,60 @@ return PortalObjectId.parse(id, PortalObjectPath.LEGACY_BASE64_FORMAT); } - /** Bypass the rest of the life cycle and re-display page */ - public void renderResponse() + // Rename and delete operations + + public void select(ActionEvent event) { - FacesContext.getCurrentInstance().renderResponse(); + selectedName = getFacesParam(SELECTED_NAME); + selectedType = CoordinationType.valueOf(getFacesParam(SELECTED_TYPE)); + + // make manager accessible to CoordinationType + eventManagerHolder.set(eventManager); + windowManagerHolder.set(windowManager); } + + public String getSelectedName() + { + return selectedName; + } + + public String getSelectedType() + { + Locale locale = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(); + ResourceBundle rb = ResourceBundle.getBundle(RESOURCE_NAME, locale); + return rb.getString(selectedType.localizationKey()); + } + + public String deleteSelected(ActionEvent actionEvent) + { + if(selectedType != null) + { + try + { + selectedType.bean().delete(selectedName); + } + catch (IllegalCoordinationException e) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } + } + + // reset selection + selectedType = null; + selectedName = null; + return null; + } + + public String renameSelected() + { + if(selectedType != null) + { + selectedType.bean().rename(selectedName); + } + + // reset selection + selectedType = null; + selectedName = null; + return null; + } } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-08-28 11:12:43 UTC (rev 11755) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-08-28 13:12:35 UTC (rev 11756) @@ -31,21 +31,16 @@ import org.jboss.portal.portlet.info.EventingInfo; import org.jboss.portal.portlet.info.PortletInfo; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; import javax.xml.namespace.QName; -import java.text.MessageFormat; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import java.util.Locale; import java.util.Map; -import java.util.ResourceBundle; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; @@ -54,10 +49,8 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class EventWiringManagerBean +public class EventWiringManagerBean extends CoordinationManagerBean.CoordinationBean { - private CoordinationManagerBean managerBean; - private Map<String, DisplayEventWiring> displayEventWirings; private Map<QNameSelectItem, SortedSet<WindowSelectItem>> eventNameToWindowSources; private Map<QNameSelectItem, SortedSet<WindowSelectItem>> eventNameToWindowDestinations; @@ -68,25 +61,8 @@ private List<String> selectedDestinationWindows; private EventWiringInfoCreator currentWiring; - private String selectedForDeletionName; - private String selectedForDeletionType; - private static final String RESOURCE_NAME = "Resource"; - private static final String COORDINATION_UNKNOWN = "COORDINATION_UNKNOWN"; - private static final String COORDINATION_WIRING = "COORDINATION_WIRING"; - private static final String COORDINATION_PARAMETER = "COORDINATION_PARAMETER"; - - public CoordinationManagerBean getManagerBean() + public void loadInfoFrom(Page page) { - return managerBean; - } - - public void setManagerBean(CoordinationManagerBean managerBean) - { - this.managerBean = managerBean; - } - - public void loadEventWirings(Page page) - { Collection<EventWiringInfo> wiringInfos = managerBean.getCoordinationService().getEventWirings(page); if (!wiringInfos.isEmpty()) { @@ -345,65 +321,26 @@ return null; } - public String getSelectedForDeletionName() + public String delete(String name) throws IllegalCoordinationException { - return selectedForDeletionName; - } + DisplayEventWiring displayEvent = displayEventWirings.get(name); - public String getSelectedForDeletionType() - { - Locale locale = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(); - ResourceBundle rb = ResourceBundle.getBundle(RESOURCE_NAME, locale); - String localizationKey = COORDINATION_UNKNOWN; - if ("wiring".equals(selectedForDeletionType)) - { - localizationKey = COORDINATION_WIRING; - } - else if ("parameter".equals(selectedForDeletionType)) - { - localizationKey = COORDINATION_PARAMETER; - } - - return MessageFormat.format(rb.getString(localizationKey), null); - } - - public void selectWiringForDeletion(ActionEvent event) - { - selectedForDeletionName = managerBean.getFacesParam("wiring"); - selectedForDeletionType = managerBean.getFacesParam("type"); - } - - public String deleteWiring(ActionEvent actionEvent) - { - DisplayEventWiring displayEvent = displayEventWirings.get(selectedForDeletionName); - if (displayEvent != null) { EventWiringInfo event = displayEvent.getEventInfo(); - try - { - managerBean.getCoordinationService().removeEventWiring(event); - displayEventWirings.remove(selectedForDeletionName); - } - catch (IllegalCoordinationException e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } - - // reset selected values - selectedForDeletionName = null; - selectedForDeletionType = null; + managerBean.getCoordinationService().removeEventWiring(event); + displayEventWirings.remove(name); } return null; } - public String renameWiring() + public String rename(String name) { - String wiring = managerBean.getFacesParam("wiring"); - DisplayEventWiring displayEvent = displayEventWirings.get(wiring); + DisplayEventWiring displayEvent = displayEventWirings.get(name); if (displayEvent != null) { //todo: implement, rename operation should be on CoordinationConfigurator + EventWiringInfo event = displayEvent.getEventInfo(); } throw new NotYetImplemented("renameWiring not yet implemented!"); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-08-28 11:12:43 UTC (rev 11755) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/WindowBindingManagerBean.java 2008-08-28 13:12:35 UTC (rev 11756) @@ -34,7 +34,6 @@ import org.jboss.portal.portlet.info.ParameterInfo; import org.jboss.portal.portlet.info.PortletInfo; -import javax.faces.event.ActionEvent; import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.Collection; @@ -49,9 +48,8 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class WindowBindingManagerBean +public class WindowBindingManagerBean extends CoordinationManagerBean.CoordinationBean { - private CoordinationManagerBean managerBean; private Map<String, String> windows; private List<String> selectedWindows; private Map<String, String> aliasBindings; @@ -59,9 +57,7 @@ private String selectedRenderParameter; private Map<String, String> availableRenderParameters; private String windowBindingName; - private String selectedForDeletionName; - private String selectedForDeletionType; - + private Map<String, DisplayParameterBinding> displayParameterBindings; public Map<String, String> getWindows() @@ -151,12 +147,6 @@ this.windows.put(window.getName(), window.getId().toString(PortalObjectPath.LEGACY_BASE64_FORMAT)); } - public void setManagerBean(CoordinationManagerBean managerBean) - { - this.managerBean = managerBean; - } - - public static class DisplayParameterBinding implements Comparable { private String id; @@ -234,7 +224,7 @@ this.windows = new LinkedHashMap<String, String>(children.size()); } - public void loadWindowBindings(Page page) + public void loadInfoFrom(Page page) { //aliasbindings prep for ui for (AliasBindingInfo abInfo : managerBean.getCoordinationService().getAliasBindings(page)) @@ -301,43 +291,26 @@ return null; } - public void selectBindingForDeletion(ActionEvent event) + public String delete(String name) throws IllegalCoordinationException { - selectedForDeletionName = managerBean.getFacesParam("binding"); - selectedForDeletionType = managerBean.getFacesParam("type"); - } + DisplayParameterBinding displayParam = displayParameterBindings.get(name); - public String deleteBinding(ActionEvent actionEvent) - { - DisplayParameterBinding displayParam = displayParameterBindings.get(selectedForDeletionName); - if (displayParam != null) { WindowBindingInfo bindingInfo = displayParam.getBindingInfo(); - try - { - managerBean.getCoordinationService().removeWindowBinding(bindingInfo); - displayParameterBindings.remove(selectedForDeletionName); - } - catch (IllegalCoordinationException e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } - - // reset selected values - selectedForDeletionName = null; - selectedForDeletionType = null; + managerBean.getCoordinationService().removeWindowBinding(bindingInfo); + displayParameterBindings.remove(name); } return null; } - public String renameWiring() + public String rename(String name) { - String wiring = managerBean.getFacesParam("binding"); - DisplayParameterBinding displayParam = displayParameterBindings.get(wiring); + DisplayParameterBinding displayParam = displayParameterBindings.get(name); if (displayParam != null) { //todo: implement, rename operation should be on CoordinationConfigurator + WindowBindingInfo bindingInfo = displayParam.getBindingInfo(); } throw new NotYetImplemented("renameWiring not yet implemented!"); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteCoordination.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteCoordination.xhtml 2008-08-28 11:12:43 UTC (rev 11755) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteCoordination.xhtml 2008-08-28 13:12:35 UTC (rev 11756) @@ -12,31 +12,31 @@ <ui:param name="portalObjectScreen" value="#{bundle.COMMON_DELETE}"/> <ui:define name="content"> - <f:subview rendered="#{empty coordinationManager.selectedForDeletionName}"> + <f:subview rendered="#{empty coordinationManager.selectedName}"> <p class="portlet-msg-error">#{bundle.COMMON_INCONSISTENT_STATE}</p> </f:subview> - <f:subview rendered="#{not empty coordinationManager.selectedForDeletionName}"> + <f:subview rendered="#{not empty coordinationManager.selectedName}"> <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> - <h3>#{bundle.COMMON_DELETE}  <h:outputText value="#{coordinationManager.selectedForDeletionType}"/></h3> + <h3>#{bundle.COMMON_DELETE}  <h:outputText value="#{coordinationManager.selectedType}"/></h3> <p class="portlet-msg-alert"> #{bundle.COMMON_DELETING} - <span class="objectName">#{coordinationManager.selectedForDeletionName}</span> - #{coordinationManager.selectedForDeletionType} #{bundle.COMMON_FROM} + <span class="objectName">#{coordinationManager.selectedName}</span> + #{coordinationManager.selectedType} #{bundle.COMMON_FROM} <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}"> <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> </c:if> #{portalobjectmgr.selectedObject.typeName}! </p> - <p class="portlet-class">#{bundle.COMMON_SURE_DELETE} #{coordinationManager.selectedForDeletionType}?</p> + <p class="portlet-class">#{bundle.COMMON_SURE_DELETE} #{coordinationManager.selectedType}?</p> <h:form> <h:commandButton value="#{bundle.COMMON_DELETE}" action="editCoordination" - actionListener="#{coordinationManager.deleteWiring}" + actionListener="#{coordinationManager.deleteSelected}" styleClass="portlet-form-button portlet-section-buttonrow"> </h:commandButton> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="editCoordination" Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-28 11:12:43 UTC (rev 11755) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-08-28 13:12:35 UTC (rev 11756) @@ -79,13 +79,14 @@ </h:column> <h:column> <f:facet name="header">Actions</f:facet> - <h:commandLink action="#{windowCoordination.renameWiring}"> + <h:commandLink action="#{coordinationManager.renameSelected}" actionListener="#{coordinationManager.select}"> <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="binding" value="#{binding.name}"/> + <f:param name="name" value="#{binding.name}"/> + <f:param name="type" value="parameter"/> </h:commandLink> | - <h:commandLink action="confirmCoordinationDeletion" actionListener="#{windowCoordination.selectBindingForDeletion}"> + <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="binding" value="#{binding.name}"/> + <f:param name="name" value="#{binding.name}"/> <f:param name="type" value="parameter"/> </h:commandLink> </h:column> @@ -196,13 +197,14 @@ <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_ACTIONS}"/> </f:facet> - <h:commandLink action="#{eventCoordination.renameWiring}"> + <h:commandLink action="#{coordinationManager.renameSelected}" actionListener="#{coordinationManager.select}"> <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="wiring" value="#{wiring.name}"/> + <f:param name="name" value="#{wiring.name}"/> + <f:param name="type" value="wiring"/> </h:commandLink> | - <h:commandLink action="confirmCoordinationDeletion" actionListener="#{eventCoordination.selectWiringForDeletion}"> + <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="wiring" value="#{wiring.name}"/> + <f:param name="name" value="#{wiring.name}"/> <f:param name="type" value="wiring"/> </h:commandLink> </h:column>

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11755 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-28 07:12:43 -0400 (Thu, 28 Aug 2008) New Revision: 11755 Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/portalapi.xml docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/themeandlayouts.xml docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/urls.xml docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml Log: Added some documentation Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/portalapi.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/portalapi.xml 2008-08-28 09:05:23 UTC (rev 11754) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/portalapi.xml 2008-08-28 11:12:43 UTC (rev 11755) @@ -1,4 +1,6 @@ -<chapter id="portalapi"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"><chapter id="portalapi"> <chapterinfo> <author> <firstname>Julien</firstname> @@ -28,12 +30,12 @@ <emphasis>org.jboss.portal.WindowState</emphasis> which offer comparable characteristics, the main differences are:</para> <itemizedlist> - <listitem>Usage of factory methods to obtain instances.</listitem> - <listitem>Classes implements the <emphasis>java.io.Serializable</emphasis> interface.</listitem> + <listitem><para>Usage of factory methods to obtain instances.</para></listitem> + <listitem><para>Classes implements the <emphasis>java.io.Serializable</emphasis> interface.</para></listitem> </itemizedlist> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/Mode.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/Mode.png" format="PNG"/> </imageobject> <caption> <para>The Mode class</para> @@ -41,45 +43,81 @@ </mediaobject> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/WindowState.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/WindowState.png" format="PNG"/> </imageobject> <caption> <para>The WindowState class</para> </caption> </mediaobject> - <note>In the Portal API, the <emphasis>Mode</emphasis> interface is named like this because it does + <note><para>In the Portal API, the <emphasis>Mode</emphasis> interface is named like this because it does represent the mode of some visual object. The Portlet API names it <emphasis>PortletMode</emphasis> because - it makes the assumption that the underlying object is of type Portlet.</note> + it makes the assumption that the underlying object is of type Portlet.</para></note> </sect1> + <sect1> + <title>Portlet to Portal communication</title> + <para>There are times when a portlet needs to signal the portal or share information with it. The portal is the only authority + to decide if it will take into account that piece of information or ignore it. In JBoss Portal we use as much as possible the + mechanisms offered by the portlet spec to achieve that communication.</para> + <sect2> + <title>Requesting a sign out</title> + <para> + If a portlet desires to sign out the user, it can let the portal know by triggering a JSR-286 portlet event. + To do so, simply defines the event "signOut" in the namespace "urn:jboss:portal" as a publishing event. + In the action phase of the portlet, trigger the event, as a payload you can specify a redirection URL. If the payload is null, + it will redirect the user to the default page of the default portal. + See the following snippet to use in the action phase, it will ask the portal to sign out the user and redirect him to the JBoss + Portal blog: + <programlisting role="java"><![CDATA[QName name = new QName("urn:jboss:portal", "signOut"); +response.setEvent(name, "http://blog.jboss-portal.org"); ]]></programlisting> + </para> + </sect2> + <sect2> + <title>Setting up the web browser title</title> + <para> + The JSR-286 specification introduced a new phase for setting up the HTML headers. It is commonly used to add stylesheets + and javascript to the page. An extension of it for JBoss Portal lets you define the web browser title. + To define the web browser title, a portlet simply needs to define a new header element "title". This could be done by a portlet overriding + the method <literal>doHeaders(RenderRequest req, RenderResponse resp)</literal> to add such an element. + <programlisting role="java"><![CDATA[public void doHeaders(RenderRequest req, RenderResponse resp) +{ + Element element = resp.createElement("title"); + element.setTextContent("My new web browser title"); + resp.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, element); +}]]></programlisting> + <warning><para>It several portlets on a page defines a web browser title, only one of them will be displayed. + We can consider that the title to be displayed will be randomly chosen.</para></warning> + </para> + </sect2> + </sect1> <sect1> <title>Portal URL</title> <para>The Portal API defines the <emphasis>org.jboss.portal.api.PortalURL</emphasis> interface to represent URL managed by the portal.</para> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalURL.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/PortalURL.png" format="PNG"/> </imageobject> <caption> <para>The PortalURL interface</para> </caption> </mediaobject> <itemizedlist> - <listitem>The <emphasis>setAuthenticated(Boolean wantAuthenticated)</emphasis> methods defines if the + <listitem><para>The <emphasis>setAuthenticated(Boolean wantAuthenticated)</emphasis> methods defines if the URL requires the authentication of the user. If the argument value is true then the user must be authenticated to access the URL, if the argument value is false then the user should not be authenticated. Finally if the argument value is - null then it means that the URL authenticated mode should reuse the current mode.</listitem> - <listitem>The <emphasis>setSecure(Boolean wantSecure)</emphasis> methods defines the same as above but for the - transport guarantee offered by the underlying protocol which means most of the time the secure HTTP protocol (HTTPS).</listitem> - <listitem>The <emphasis>setRelative(boolean relative)</emphasis> defines the output format of the URL and - whether the created URL will be an URL relative to the same web server or will be the full URL.</listitem> - <listitem>The <emphasis>toString()</emphasis> method will create the URL as a string.</listitem> + null then it means that the URL authenticated mode should reuse the current mode.</para></listitem> + <listitem><para>The <emphasis>setSecure(Boolean wantSecure)</emphasis> methods defines the same as above but for the + transport guarantee offered by the underlying protocol which means most of the time the secure HTTP protocol (HTTPS).</para></listitem> + <listitem><para>The <emphasis>setRelative(boolean relative)</emphasis> defines the output format of the URL and + whether the created URL will be an URL relative to the same web server or will be the full URL.</para></listitem> + <listitem><para>The <emphasis>toString()</emphasis> method will create the URL as a string.</para></listitem> </itemizedlist> </sect1> <sect1> <title>Portal session</title> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalSession.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/PortalSession.png" format="PNG"/> </imageobject> <caption> <para>The PortalSession interface</para> @@ -95,7 +133,7 @@ <title>Portal runtime context</title> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalRuntimeContext.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/PortalRuntimeContext.png" format="PNG"/> </imageobject> <caption> <para>The PortalRuntimeContext interface</para> @@ -113,13 +151,13 @@ <para>The portal structure is a tree formed by nodes. It is possible to programmatically access the portal tree in order to </para> <itemizedlist> - <listitem>discover the tree structure of the portal</listitem> - <listitem>create URL that will render the different portal nodes</listitem> - <listitem>access the properties of a specific node</listitem> + <listitem><para>discover the tree structure of the portal</para></listitem> + <listitem><para>create URL that will render the different portal nodes</para></listitem> + <listitem><para>access the properties of a specific node</para></listitem> </itemizedlist> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalNode.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/PortalNode.png" format="PNG"/> </imageobject> <caption> <para>The PortalNode interface</para> @@ -142,9 +180,9 @@ <para>The interface offers methods to retrieve informations for a given node such as the node type, the node name or the properties of the node. The noticeable node types are:</para> <itemizedlist> - <listitem>PortalNode.TYPE_PORTAL : the node represents a portal</listitem> - <listitem>PortalNode.TYPE_PAGE : the node represents a portal page</listitem> - <listitem>PortalNode.TYPE_WINDOW : the node represents a page window</listitem> + <listitem><para>PortalNode.TYPE_PORTAL : the node represents a portal</para></listitem> + <listitem><para>PortalNode.TYPE_PAGE : the node represents a portal page</para></listitem> + <listitem><para>PortalNode.TYPE_WINDOW : the node represents a page window</para></listitem> </itemizedlist> <para>The <emphasis>org.jboss.portal.api.node.PortalNodeURL</emphasis> is an extension of the <emphasis>PortalURL</emphasis> interface which adds additional methods useful for setting parameters on the URL. There are no guarantees that the @@ -174,7 +212,7 @@ mode and window states of portal nodes of type window.</para> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/NavigationalStateContext.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/NavigationalStateContext.png" format="PNG"/> </imageobject> <caption> <para>The NavigationalStateContext interface</para> @@ -189,7 +227,7 @@ </para> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalEvent.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/PortalEvent.png" format="PNG"/> </imageobject> <caption> <para>The PortalEvent class</para> @@ -200,7 +238,7 @@ </para> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalEventContext.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/PortalEventContext.png" format="PNG"/> </imageobject> <caption> <para>The PortalEventContext interface</para> @@ -213,7 +251,7 @@ </para> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalEventListener.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/PortalEventListener.png" format="PNG"/> </imageobject> <caption> <para>The PortalEventListener interface</para> @@ -229,9 +267,9 @@ and register it with the service registry. We will see how to achieve that in the example section of this chapter. </para> <note> - The event propagation model uses one instance of a listener class to receive all portal events that + <para>The event propagation model uses one instance of a listener class to receive all portal events that may be routed to that class when appropriate. Therefore implementors needs to be aware of that model - and must provide <emphasis role="bold">thread safe</emphasis> implementations. + and must provide <emphasis role="bold">thread safe</emphasis> implementations.</para> </note> <sect2> <title>Portal node events</title> @@ -240,7 +278,7 @@ a corresponding event will be fired.</para> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalNodeEvent.png" format="png" scalefit="1"/> + <imagedata align="center" fileref="images/portalapi/PortalNodeEvent.png" format="PNG" scalefit="1"/> </imageobject> <caption> <para>The portal node event class hierarchy</para> @@ -275,7 +313,7 @@ </para> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/eventpropagation.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/eventpropagation.png" format="PNG"/> </imageobject> <caption> <para>The portal node event propagation model</para> @@ -299,7 +337,7 @@ <title>Portal node event context</title> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalNodeEventContext.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/PortalNodeEventContext.png" format="PNG"/> </imageobject> <caption> <para>The PortalNodeEventContext interface</para> @@ -331,7 +369,7 @@ event is not bound to a portal node since it is triggered whenever a portal session is created or destroyed</para> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/PortalSessionEvent.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/PortalSessionEvent.png" format="PNG"/> </imageobject> <caption> <para>The PortalSessionEvent class</para> @@ -339,8 +377,8 @@ </mediaobject> <para>There are two different types of events: <itemizedlist> - <listitem>org.jboss.portal.api.session.event.PortalSessionEvent.SESSION_CREATED, fired when a new portal session is created</listitem> - <listitem>org.jboss.portal.api.session.event.PortalSessionEvent.SESSION_DESTROYED, fired when a new portal session is destroyed</listitem> + <listitem><para>org.jboss.portal.api.session.event.PortalSessionEvent.SESSION_CREATED, fired when a new portal session is created</para></listitem> + <listitem><para>org.jboss.portal.api.session.event.PortalSessionEvent.SESSION_DESTROYED, fired when a new portal session is destroyed</para></listitem> </itemizedlist> </para> </sect2> @@ -351,7 +389,7 @@ the method <emphasis>String getId()</emphasis>.</para> <mediaobject> <imageobject> - <imagedata align="center" fileref="images/portalapi/user.event.png" format="png"/> + <imagedata align="center" fileref="images/portalapi/user.event.png" format="PNG"/> </imageobject> <caption> <para>The UserEvent class and UserAuthenticationEvent sub-classes</para> @@ -359,8 +397,8 @@ </mediaobject> <para>The UserAuthenticationEvent triggers two events that can be catched: <itemizedlist> - <listitem>org.jboss.portal.api.session.event.UserAuthenticationEvent.SIGN_IN, fired when a portal user signs in</listitem> - <listitem>org.jboss.portal.api.session.event.UserAuthenticationEvent.SIGN_OUT, fired when a portal user signs out</listitem> + <listitem><para>org.jboss.portal.api.session.event.UserAuthenticationEvent.SIGN_IN, fired when a portal user signs in</para></listitem> + <listitem><para>org.jboss.portal.api.session.event.UserAuthenticationEvent.SIGN_OUT, fired when a portal user signs out</para></listitem> </itemizedlist> </para> <para>Based on the UserEvent class other custom user related events could be added like one that would trigger when a new user is @@ -377,7 +415,7 @@ do that we just need to keep track of Sign-in and Sign-out events.</para> <para>First, let's write our listener. It just a class that will implement <emphasis>org.jboss.portal.api.event.PortalEventListener</emphasis> and its unique method <emphasis>void onEvent(PortalEventContext eventContext, PortalEvent event)</emphasis>. Here is such an example: - <programlisting><![CDATA[ + <programlisting role="java"><![CDATA[ package org.jboss.portal.core.portlet.test.event; import[...] @@ -439,14 +477,14 @@ This snippet can be kept as it is, providing you change the values: <itemizedlist> <listitem> - <emphasis role="bold">name:</emphasis> Must follow the pattern: portal:service=ListenerService,type={{UNIQUENAME}} + <para><emphasis role="bold">name:</emphasis> Must follow the pattern: portal:service=ListenerService,type={{UNIQUENAME}}</para> </listitem> <listitem> - <emphasis role="bold">RegistryId:</emphasis> Must match the type (here: counter_listener) + <para><emphasis role="bold">RegistryId:</emphasis> Must match the type (here: counter_listener)</para> </listitem> <listitem> - <emphasis role="bold">ListenerClassName:</emphasis> Full path to the listener - (here: org.jboss.portal.core.portlet.test.event.UserCounterListener). + <para><emphasis role="bold">ListenerClassName:</emphasis> Full path to the listener + (here: org.jboss.portal.core.portlet.test.event.UserCounterListener).</para> </listitem> </itemizedlist> </para> @@ -517,7 +555,7 @@ as a request parameter in our case). In order to achieve this goal, we will write an inner Listener in Portlet B that will be triggered on any WindowActionEvent of Portlet A. This listener will create a new WindowActionEvent on the window of Portlet B. - <programlisting><![CDATA[ + <programlisting role="java"><![CDATA[ public static class Listener implements PortalNodeEventListener { public PortalNodeEvent onEvent(PortalNodeEventContext context, PortalNodeEvent event) @@ -574,7 +612,7 @@ --> <para> We still need to register our listener as an mbean: - <programlisting> + <programlisting role="xml"> <![CDATA[<mbean code="org.jboss.portal.core.event.PortalEventListenerServiceImpl" name="portal:service=ListenerService,type=test_listener" @@ -609,8 +647,8 @@ can be specified, the event mechanism is primarily done to let the developer change the navigation state of the portal, this example being a nice side-effect of this feature. </para> - <note>The portlet 2.0 specification (JSR 286) will cover Inter Portlet Communication so that portlets using it - can work with different portal vendors.</note> + <note><para>The portlet 2.0 specification (JSR 286) will cover Inter Portlet Communication so that portlets using it + can work with different portal vendors.</para></note> </sect2> <sect2> <title>Link to other pages</title> @@ -618,7 +656,7 @@ specification. As seen previously JBoss Portal offers an API in order to create links to other portal nodes. The JBoss request gives access to the current window node from which we can navigate from.</para> - <programlisting> + <programlisting role="java"> <![CDATA[ // Get the ParentNode. Since we are inside a Window, the Parent is the Page PortalNode thisNode = req.getPortalNode().getParent(); @@ -636,13 +674,13 @@ <para>From this, it is easy to create a menu or sitemap, the <emphasis>List getChildren()</emphasis> method will return all the child nodes on which the user has the view right access.</para> </sect2> - <note> + <sect2> <title>Samples</title> <para>Those examples are available in the core-samples package in the sources of JBoss Portal. There are more examples of events usage in the samples delivered with JBoss Portal. One of them shows the usage of a portal node event to only have one window in normal mode at a time in a region. Anytime another window is being put in normal mode, all the other windows of the same regions are automatically minimized.</para> - </note> + </sect2> </sect1> </chapter> Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/themeandlayouts.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/themeandlayouts.xml 2008-08-28 09:05:23 UTC (rev 11754) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/themeandlayouts.xml 2008-08-28 11:12:43 UTC (rev 11755) @@ -389,7 +389,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>JBoss Portal</title> + <title><p:title default="My Great Portal"/></title> <meta http-equiv="Content-Type" content="text/html;" /> <p:theme themeName='renaissance' /> <p:headerContent /> @@ -425,8 +425,14 @@ </body> </html>]]></programlisting> </para> - <para> <sect3> + <title>The title tag</title> + <para>The title tag is used to insert the web browser title defined by a portlet which + is part of the page rendering. The default attribute defines the title to use if no + portlet defined a web browser title. + </para> + </sect3> + <sect3> <title>The theme tag</title> <para>The theme tag looks for the determined theme of the current request (see Portal Themes for more details). If no theme was determined, this tag allows an @@ -456,7 +462,6 @@ for this region. This id in turn can be picked up by the CSS to style the region. </para> </sect3> - </para> </sect2> </sect1> <!-- Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/urls.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/urls.xml 2008-08-28 09:05:23 UTC (rev 11754) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/urls.xml 2008-08-28 11:12:43 UTC (rev 11755) @@ -51,6 +51,7 @@ </para> </listitem> </itemizedlist> + <note>The default page or portal can be specified either by using the admin portlet or by using the XML descriptors as explained in the <link linkend="xml.default.objectname.property">XML descriptor chapter</link>.</note> </para> </sect1> <sect1> Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml 2008-08-28 09:05:23 UTC (rev 11754) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/xmldescriptors.xml 2008-08-28 11:12:43 UTC (rev 11755) @@ -4,17 +4,19 @@ <chapter id="xmldescriptors"> <chapterinfo> <author> + <firstname>Thomas</firstname> + <surname>Heute</surname> + </author> + <author> <firstname>Roy</firstname> <surname>Russo</surname> </author> </chapterinfo> <title>XML Descriptors</title> <sect1> - <title>Changes from previous Releases</title> - <para>The previous releases of JBoss Portal did not have an external schema to validate XML descriptors; however, they were internally validated by the portal. Since JBoss Portal 2.6, a Document Type Definition (DTD) has been provided to validate descriptors. - </para> + <title>DTDs</title> <para> - To use the DTD, add the following declaration to the start of the desired descriptors: + To use a DTD, add the following declaration to the start of the desired descriptors: </para> <programlisting role="XML"><![CDATA[ <?xml version="1.0" encoding="UTF-8"?> @@ -631,13 +633,42 @@ <!ELEMENT properties (property*)>]]> </programlisting> <para> - A set of generic properties for the portal object. The <computeroutput><properties></computeroutput> elements contains definitions specific to a page. This is commonly used to define the specific theme and layout to use. If not defined, the default portal theme and layout are used. + A set of generic properties for the portal object. The <computeroutput><properties></computeroutput> elements contains definitions specific to a portal object. </para> <programlisting><![CDATA[ <!ELEMENT property (name,value)>]]> </programlisting> <para> A generic string property. + The following non exhaustive values are used: + <table> + <title>Properties</title> + <tgroup cols="2" align="left" colsep="1" rowsep="1"> + <colspec colname="name"/> + <colspec colname="description"/> + <thead> + <row> + <entry>Name</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry>layout.id</entry> + <entry>Defines the layout to use for this portal object and sub-objects if they don't override the value</entry> + </row> + <row> + <entry>theme.id</entry> + <entry>Defines the theme to use for this portal object and sub-objects if they don't override the value</entry> + </row> + <row id="xml.default.objectname.property"> + <entry>portal.defaultObjectName</entry> + <entry>This value is used to define the default child object. If applied on a <literal>context</literal>, it will define which portal is the default one. + If applied on a <literal>portal</literal>, it will define which page is the default one.</entry> + </row> + </tbody> + </tgroup> + </table> </para> <programlisting><![CDATA[ <!ELEMENT name (#PCDATA)>]]> @@ -1829,7 +1860,7 @@ <note> <title>Portal Instance <computeroutput>default</computeroutput> Page</title> <para> - For a portal instance to be accessible via a Web browser, you must define a page named <computeroutput>default</computeroutput>. + For a portal instance to be accessible via a Web browser, you must define a default page. </para> </note> </para>

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11754 - in branches/JBoss_Portal_Branch_2_7: core/src/bin/portal-core-war/layouts/1column and 13 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-08-28 05:05:23 -0400 (Thu, 28 Aug 2008) New Revision: 11754 Added: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/tag/TitleTagHandler.java Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core/.classpath branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/response/MarkupResponse.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/page/WindowResult.java branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java Log: JBPORTAL-2144: Let a portlet defines the browser title Modified: branches/JBoss_Portal_Branch_2_7/core/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-08-28 09:05:23 UTC (rev 11754) @@ -48,7 +48,7 @@ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbossha.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar" sourcepath="/module-portlet-trunk"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar" sourcepath="/module-portlet-trunk"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar" sourcepath="/module-portlet"/> <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib.jar" sourcepath="/module-portlet-2.0.0.CR2"/> <classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache-jdk50.jar"/> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-08-28 09:05:23 UTC (rev 11754) @@ -6,7 +6,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title><%= PortalConstants.VERSION.toString() %></title> + <title><p:title default="<%= PortalConstants.VERSION.toString() %>"/></title> <meta http-equiv="Content-Type" content="text/html;"/>  <script type="text/javascript"></script> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-08-28 09:05:23 UTC (rev 11754) @@ -6,7 +6,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title><%= PortalConstants.VERSION.toString() %></title> + <title><p:title default="<%= PortalConstants.VERSION.toString() %>"/></title> <meta http-equiv="Content-Type" content="text/html;"/>  <script type="text/javascript"></script> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-08-28 09:05:23 UTC (rev 11754) @@ -6,7 +6,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title><%= PortalConstants.VERSION.toString() %></title> + <title><p:title default="<%= PortalConstants.VERSION.toString() %>"/></title> <meta http-equiv="Content-Type" content="text/html;"/>  <script type="text/javascript"></script> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-08-28 09:05:23 UTC (rev 11754) @@ -6,7 +6,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title><%= PortalConstants.VERSION.toString() %></title> + <title><p:title default="<%= PortalConstants.VERSION.toString() %>"/></title> <meta http-equiv="Content-Type" content="text/html;"/>  <script type="text/javascript"></script> Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -376,22 +376,13 @@ windowTitle = window.getName(); } - String header = ""; + List<Element> headElements = null; ResponseProperties properties = fragment.getProperties(); if (properties != null) { // header handling MultiValuedPropertyMap<Element> headers = properties.getMarkupHeaders(); - List<Element> headElements = headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT); - if (headElements != null) - { - StringBuffer buffer = new StringBuffer(124 * headElements.size()); - for (Element element : headElements) - { - buffer.append(element); - } - header = buffer.toString(); - } + headElements = headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT); // deal with partial refresh MultiValuedPropertyMap<String> transport = properties.getTransportHeaders(); @@ -416,7 +407,7 @@ } // - cr = new MarkupResponse(windowTitle, contentChars, header); + cr = new MarkupResponse(windowTitle, contentChars, headElements); } else if (response instanceof ErrorResponse) Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -87,7 +87,7 @@ // For now let the controller handle non fragment response String content; - String header = ""; + List<Element> headElements = null; if (response instanceof FragmentResponse) { FragmentResponse fragment = (FragmentResponse)response; @@ -97,16 +97,7 @@ { // header handling MultiValuedPropertyMap<Element> headers = properties.getMarkupHeaders(); - List<Element> headElements = headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT); - if (headElements != null) - { - StringBuffer buffer = new StringBuffer(124 * headElements.size()); - for (Element element : headElements) - { - buffer.append(element); - } - header = buffer.toString(); - } + headElements = headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT); } } else if (response instanceof ErrorResponse) @@ -134,7 +125,7 @@ windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer"); // - WindowResult res = new WindowResult("", content, Collections.EMPTY_MAP, windowProps, header, WindowState.MAXIMIZED, Mode.VIEW); + WindowResult res = new WindowResult("", content, Collections.EMPTY_MAP, windowProps, headElements, WindowState.MAXIMIZED, Mode.VIEW); WindowContext blah = new WindowContext("BILTO", "maximized", "0", res); result.addWindowContext(blah); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/response/MarkupResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/response/MarkupResponse.java 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/response/MarkupResponse.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -22,7 +22,10 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.response; +import java.util.List; + import org.jboss.portal.core.controller.ControllerResponse; +import org.w3c.dom.Element; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -38,9 +41,9 @@ private final String content; /** . */ - private final String headerContent; + private final List<Element> headerContent; - public MarkupResponse(String title, String content, String headerContent) + public MarkupResponse(String title, String content, List<Element> headerContent) { this.title = title; this.content = content; @@ -57,7 +60,7 @@ return content; } - public String getHeaderContent() + public List<Element> getHeaderContent() { return headerContent; } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -173,7 +173,7 @@ windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer"); // - WindowResult res = new WindowResult("", rd.getMarkup(), Collections.EMPTY_MAP, windowProps, "", WindowState.MAXIMIZED, Mode.VIEW); + WindowResult res = new WindowResult("", rd.getMarkup(), Collections.EMPTY_MAP, windowProps, null, WindowState.MAXIMIZED, Mode.VIEW); WindowContext blah = new WindowContext("BILTO", "maximized", "0", res); result.addWindowContext(blah); Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld 2008-08-28 09:05:23 UTC (rev 11754) @@ -65,4 +65,13 @@ <tag-class>org.jboss.portal.theme.tag.HeaderContentTagHandler</tag-class> <body-content>empty</body-content> </tag> + <tag> + <name>title</name> + <tag-class>org.jboss.portal.theme.tag.TitleTagHandler</tag-class> + <body-content>empty</body-content> + <attribute> + <name>default</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> </taglib> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -38,10 +38,12 @@ import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; import org.jboss.portlet.JBossRenderRequest; +import org.w3c.dom.Element; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; import javax.portlet.GenericPortlet; +import javax.portlet.MimeResponse; import javax.portlet.PortletConfig; import javax.portlet.PortletException; import javax.portlet.PortletMode; @@ -188,17 +190,40 @@ // Only the editor uses it for now, so just forward hack.processAction(request, response); } - - protected void doView(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + + private File getFile(String path, Locale locale, PortletPreferences prefs) { - String path = req.getParameter(RENDER_PARAMETER_PATH); if (path == null) { - PortletPreferences prefs = req.getPreferences(); path = prefs.getValue("indexpage", "/default/index.html"); } + File file = null; + + // Get the file from the CMS, localized. + Command fileGet = CMSService.getCommandFactory().createFileGetCommand(path, locale); + file = (File)CMSService.execute(fileGet); + // + if (file == null) + { + fileGet = CMSService.getCommandFactory().createFileGetCommand(path, new Locale(CMSService.getDefaultLocale())); + file = (File)CMSService.execute(fileGet); + } + return file; + } + + protected void doView(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException + { + // Get the file obtain from doHeaders + File file = (File)req.getAttribute("file"); + + if (file == null) + { + String path = req.getParameter(RENDER_PARAMETER_PATH); + file = getFile (path, req.getLocale(), req.getPreferences()); + } + // URLFactory textURLFactory = null; if (InternalCMSContentProvider.useGlobalURL()) { @@ -211,22 +236,10 @@ // URLFactory resourceURLFactory = new GlobalURLFactory(((JBossRenderRequest)req).getControllerContext()); - - // + String path = file.getBasePath(); + try { - - // Get the file from the CMS, localized. - Command fileGet = CMSService.getCommandFactory().createFileGetCommand(path, req.getLocale()); - File file = (File)CMSService.execute(fileGet); - - // - if (file == null) - { - fileGet = CMSService.getCommandFactory().createFileGetCommand(path, new Locale(CMSService.getDefaultLocale())); - file = (File)CMSService.execute(fileGet); - } - // Translate links to resources. String sHTML = null; resp.setContentType("text/html"); @@ -357,6 +370,20 @@ PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMS_JSP_PATH + "/edit.jsp"); prd.include(req, resp); } + + public void doHeaders(RenderRequest req, RenderResponse resp) + { + String path = req.getParameter(RENDER_PARAMETER_PATH); + File file = getFile (path, req.getLocale(), req.getPreferences()); + + req.setAttribute("file", file); + if ("true".equals(req.getPreferences().getValue("setBrowserTitle", "false").toLowerCase()) && file.getContent().getTitle() != null) + { + Element element = resp.createElement("title"); + element.setTextContent(file.getContent().getTitle()); + resp.addProperty(MimeResponse.MARKUP_HEAD_ELEMENT, element); + } + } /** * @@ -372,8 +399,6 @@ content = h.group(2); } } - - return content; } Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-08-28 09:05:23 UTC (rev 11754) @@ -54,9 +54,17 @@ <name>indexpage</name> <value>/default/index.html</value> </preference> +  + <preference> + <name>setBrowserTitle</name> + <value>false</value> + </preference> </portlet-preferences> + <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event> <supported-public-render-parameter>uri</supported-public-render-parameter> - <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event> </portlet> <portlet> @@ -122,4 +130,9 @@ <qname xmlns:c="urn:jboss:portal:content">c:uri</qname> </public-render-parameter> + <public-render-parameter> + <identifier>title</identifier> + <qname xmlns:jbp="urn:jboss:portal:page">jbp:title</qname> + </public-render-parameter> + </portlet-app> Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/DynaTestContext.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -330,7 +330,7 @@ wrc.getPortlet().getMarkup(), new HashMap(), wrc.getProperties(), - "", + null, wrc.getWindowState(), wrc.getMode()); WindowContext wc = new WindowContext(wrc.getId(), rrc.getId(), Integer.toString(j.getIndex()), wr); Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -123,8 +123,7 @@ { // setup the window result Map actionsMap = Collections.EMPTY_MAP; - String headerChars = null; - return new WindowResult(title, content, actionsMap, windowProps, headerChars, null, null); + return new WindowResult(title, content, actionsMap, windowProps, null, null, null); } public static RenderSetMetaData createRenderSetMD() throws Exception Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/page/WindowResult.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/page/WindowResult.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -25,9 +25,11 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.theme.render.renderer.ActionRendererContext; +import org.w3c.dom.Element; import java.util.Collection; import java.util.Collections; +import java.util.List; import java.util.Map; /** @@ -50,7 +52,7 @@ private Map actions; /** . */ - private final String headerContent; + private final List<Element> headerContent; /** . */ private Map properties; @@ -78,14 +80,14 @@ String content, Map actions, Map windowProperties, - String headerChars, + List<Element> headerContent, WindowState windowState, Mode mode) { this.title = title; this.content = content; this.actions = actions; - this.headerContent = headerChars; + this.headerContent = headerContent; this.properties = windowProperties; this.windowState = windowState; this.mode = mode; @@ -101,7 +103,7 @@ return content; } - public String getHeaderContent() + public List<Element> getHeaderContent() { return headerContent; } Modified: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java 2008-08-27 20:59:49 UTC (rev 11753) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -26,6 +26,7 @@ import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; +import org.w3c.dom.Element; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; @@ -34,6 +35,7 @@ import javax.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; import java.util.Iterator; +import java.util.List; import java.util.Map; /** @@ -70,9 +72,18 @@ { WindowContext wc = (WindowContext)i.next(); WindowResult result = wc.getResult(); - if (result.getHeaderContent() != null) + List<Element> headElements = result.getHeaderContent(); + if (headElements != null) { - out.println(result.getHeaderContent()); + StringBuffer buffer = new StringBuffer(124 * headElements.size()); + for (Element element : headElements) + { + if (!"title".equals(element.getNodeName().toLowerCase())) + { + buffer.append(element); + } + } + out.println(buffer.toString()); } } out.flush(); Added: branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/tag/TitleTagHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/tag/TitleTagHandler.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/theme/src/main/org/jboss/portal/theme/tag/TitleTagHandler.java 2008-08-28 09:05:23 UTC (rev 11754) @@ -0,0 +1,102 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.theme.tag; + +import java.io.IOException; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; +import javax.servlet.jsp.tagext.SimpleTagSupport; + +import org.jboss.portal.theme.LayoutConstants; +import org.jboss.portal.theme.page.PageResult; +import org.jboss.portal.theme.page.WindowContext; +import org.jboss.portal.theme.page.WindowResult; +import org.w3c.dom.Element; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class TitleTagHandler extends SimpleTagSupport +{ + + private String defaultTitle = "JBoss Portal"; + + public void doTag() throws JspException, IOException + { + // Get page and region + PageContext app = (PageContext)getJspContext(); + HttpServletRequest request = (HttpServletRequest)app.getRequest(); + + // + PageResult page = (PageResult)request.getAttribute(LayoutConstants.ATTR_PAGE); + JspWriter out = this.getJspContext().getOut(); + if (page == null) + { + out.write("<p bgcolor='red'>No page to render!</p>"); + out.write("<p bgcolor='red'>The page to render (PageResult) must be set in the request attribute '" + LayoutConstants.ATTR_PAGE + "'</p>"); + out.flush(); + return; + } + + // + Map results = page.getWindowContextMap(); + String title = defaultTitle; + for (Iterator i = results.values().iterator(); i.hasNext();) + { + WindowContext wc = (WindowContext)i.next(); + WindowResult result = wc.getResult(); + List<Element> headElements = result.getHeaderContent(); + if (headElements != null) + { + for (Element element : headElements) + { + if ("title".equals(element.getNodeName().toLowerCase()) && element.getFirstChild() != null) + { + title = element.getFirstChild().getTextContent(); + break; + } + } + } + } + out.println(title); + out.flush(); + } + + public void setDefault(String defaultTitle) + { + this.defaultTitle = defaultTitle; + } + + public String getDefault() + { + return defaultTitle; + } +} +

15 years, 9 months

1
0
0 / 0

JBoss Portal SVN: r11753 - in modules/portlet/trunk: portal and 8 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2008-08-27 16:59:49 -0400 (Wed, 27 Aug 2008) New Revision: 11753 Added: modules/portlet/trunk/portal/src/assemble/simple-portal-jboss50.xml Removed: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/META-INF/ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/META-INF/ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml Modified: modules/portlet/trunk/.classpath modules/portlet/trunk/portal/pom.xml modules/portlet/trunk/portal/src/build.xml modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestSuite.java modules/portlet/trunk/test/src/test/build.xml Log: Update JBoss AS5 support to not require changes to StandardHost.startChildren. Update support for simple portal and JBoss AS 5. Modified: modules/portlet/trunk/.classpath =================================================================== --- modules/portlet/trunk/.classpath 2008-08-27 20:26:54 UTC (rev 11752) +++ modules/portlet/trunk/.classpath 2008-08-27 20:59:49 UTC (rev 11753) @@ -9,7 +9,7 @@ <classpathentry kind="src" path="samples/src/main/java"/> <classpathentry kind="src" path="portlet/src/test/java"/> <classpathentry kind="src" path="mc/src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_15"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: modules/portlet/trunk/portal/pom.xml =================================================================== --- modules/portlet/trunk/portal/pom.xml 2008-08-27 20:26:54 UTC (rev 11752) +++ modules/portlet/trunk/portal/pom.xml 2008-08-27 20:59:49 UTC (rev 11753) @@ -104,6 +104,7 @@ <descriptors> <descriptor>src/assemble/simple-portal-jboss42.xml</descriptor> <descriptor>src/assemble/simple-portal-tomcat60.xml</descriptor> + <descriptor>src/assemble/simple-portal-jboss50.xml</descriptor> </descriptors> </configuration> <executions> @@ -120,4 +121,4 @@ </build> -</project> \ No newline at end of file +</project> Added: modules/portlet/trunk/portal/src/assemble/simple-portal-jboss50.xml =================================================================== --- modules/portlet/trunk/portal/src/assemble/simple-portal-jboss50.xml (rev 0) +++ modules/portlet/trunk/portal/src/assemble/simple-portal-jboss50.xml 2008-08-27 20:59:49 UTC (rev 11753) @@ -0,0 +1,45 @@ +<assembly> + <id>jboss50</id> + <formats> + <format>dir</format> + </formats> + <baseDirectory>simple-portal</baseDirectory> + + <componentDescriptors> + <componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor> + </componentDescriptors> + + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <includes> + + <include>org.jboss.portal.common:common-common</include> + <include>org.jboss.portal.common:common-portal</include> + <include>org.jboss.portal.web:web-web</include> + <include>org.jboss.portal.portlet:portlet-portlet</include> + + <include>javax.ccpp:ccpp</include> + <include>javax.portlet:portlet-api</include> + + </includes> + </dependencySet> + <dependencySet> + <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory> + <includes> + + <include>org.jboss.portal.common:common-mc</include> + <include>org.jboss.portal.portlet:portlet-controller</include> + <include>org.jboss.portal.portlet:portlet-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> + </dependencySets> + +</assembly> Modified: modules/portlet/trunk/portal/src/build.xml =================================================================== --- modules/portlet/trunk/portal/src/build.xml 2008-08-27 20:26:54 UTC (rev 11752) +++ modules/portlet/trunk/portal/src/build.xml 2008-08-27 20:59:49 UTC (rev 11753) @@ -172,6 +172,14 @@ </not> </and> </condition> + <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}"> + <and> + <isset property="env.JBOSS_5_0_HOME"/> + <not> + <isset property="JBOSS_5_0_HOME"/> + </not> + </and> + </condition> <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}"> <and> <isset property="env.TOMCAT_6_0_HOME"/> @@ -197,6 +205,16 @@ </condition> </fail> + <fail message="Please set the environment variable JBOSS_5_0_HOME"> + <condition> + <and> + <not> + <isset property="JBOSS_5_0_HOME"/> + </not> + </and> + </condition> + </fail> + <fail message="Please set the environment variable TOMCAT_6_0_HOME"> <condition> <and> @@ -430,6 +448,43 @@ <fileset dir="${test.temp.dir}/jboss-4.2/portlet-test-war"/> </jar> +  + <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war"> + <fileset dir="${target}/test-classes/portlet-test-war"/> + <fileset dir="${target}/test-classes/jboss-5.0/portlet-test-war"/> + </copy> + <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war/WEB-INF/lib" flatten="true"> + +  + <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> + +  + <path refid="mc.portal-common"/> + + <path refid="mc.portal-portlet-controller"/> + <path refid="mc.portal-portlet-mc"/> + +  + <path refid="mc.jboss-remoting"/> + <path refid="mc.portal-test-generic"/> + + +  + <path refid="mc.trove"/> + <path refid="mc.javassist"/> + <path refid="mc.jboss_common_core"/> + <path refid="mc.jboss_vfs"/> + <path refid="mc.jboss_xb"/> + <path refid="mc.jboss_aop"/> + <path refid="mc.jboss_microcontainer"/> + <path refid="mc.jaxb-api"/> + + </copy> + <mkdir dir="${test.temp.lib}/jboss-5.0"/> + <jar jarfile="${test.temp.lib}/jboss-5.0/portlet-test.war"> + <fileset dir="${test.temp.dir}/jboss-5.0/portlet-test-war"/> + </jar> +  <copy todir="${test.temp.dir}/tomcat-6.0/portlet-test-war"> <fileset dir="${target}/test-classes/portlet-test-war"/> @@ -586,8 +641,101 @@ </antcall> </target> + + <target name="cargo.jboss-5.0.start" depends="cargo.setup"> +  + + + <cargo + containerId="jboss5x" + home="${test.jboss-5.0.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + action="start" + wait="${cargo.wait}"> +  + <sharedClasspath> + + <path location="${dependency.portal-common.jar}"/> + <path location="${dependency.portal-common-portal.jar}"/> + <path location="${dependency.portal-portlet.jar}"/> + <path location="${dependency.portal-web.jar}"/> + <path location="${dependency.jsr168api.jar}"/> + <path location="${dependency.ccpp.jar}"/> + + <path location="${dependency.jboss-unit.jar}"/> + <path location="${dependency.jboss-unit-remote.jar}"/> + <path location="${dependency.portal-test.jar}"/> + + </sharedClasspath> + <configuration home="${test.jboss-5.0.tempdir}"> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> +  + <deployable type="war" file="${test.temp.lib}/jboss-5.0/portlet-test.war"/> + </configuration> + </cargo> + </target> + + <target name="cargo.jboss-5.0.stop" depends="cargo.setup"> + <cargo + containerId="jboss5x" + home="${test.jboss-5.0.home}" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" + action="stop"> +  + <configuration home="${test.jboss-5.0.tempdir}"> + <property name="cargo.rmi.port" value="1099"/> + </configuration> + </cargo> + </target> + + <target name="tests.jboss-5.0.container-servlet" if="${test.jboss-5.0.home.variable-name}"> + <echo message="Starting JBoss 5.0 container-servlet tests with ${test.jboss-5.0.home}"/> + <antcall target="cargo.jboss-5.0.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${test.archive.path}"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="${test.jboss-5.0.name}"/> + <param name="test.deploy.name" value="jboss-5.0-container-servlet"/> + </antcall> + <antcall target="cargo.jboss-5.0.stop"> + </antcall> + </target> + + <target name="tests.jboss-5.0.generic" if="${test.jboss-5.0.home.variable-name}"> + <echo message="Starting JBoss 5.0 generic tests with ${test.jboss-5.0.home}"/> + <antcall target="cargo.jboss-5.0.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${test.archive.path}"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="${test.jboss-5.0.name}"/> + <param name="test.deploy.name" value="jboss-5.0-generic"/> + </antcall> + <antcall target="cargo.jboss-5.0.stop"> + </antcall> + </target> + + <target name="tests.jboss-5.0"> + <antcall target="tests.jboss-5.0.container-servlet"> + <param name="test.id" value="JBoss-5_0-container-servlet"/> + <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/> + <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/> + <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/> + <param name="test.jboss-5.0.tempdir" value="${target}/cargo-tmp/5_0"/> + </antcall> + </target> + <target name="tests.jboss"> <antcall target="tests.jboss-4.2"/> + <antcall target="tests.jboss-5.0"/> </target> <target name="cargo.tomcat-6.start" depends="cargo.setup"> @@ -726,6 +874,7 @@ <property name="tck" value="${target}/tck"/> <property name="tck-jboss" value="${tck}/jboss42"/> + <property name="tck-jboss5" value="${tck}/jboss5"/> <property name="tck-tomcat" value="${tck}/tomcat6"/> @@ -875,14 +1024,14 @@ <property name="portal.dir" value="${target}/portal"/> <property name="simple.tomcat.dir" value="${portal.dir}/tomcat"/> <property name="simple.as42.dir" value="${portal.dir}/as42"/> -  + <property name="simple.as5.dir" value="${portal.dir}/as5"/> <delete dir="${portal.dir}"/> <mkdir dir="${portal.dir}"/> <mkdir dir="${simple.tomcat.dir}"/> <mkdir dir="${simple.as42.dir}"/> -  + <mkdir dir="${simple.as5.dir}"/> <jar jarfile="${target}/portlet-test-lib.jar"> @@ -919,6 +1068,9 @@  <generic-package-simple-portal server="${simple.as42.dir}"/> +  + <generic-package-simple-portal server="${simple.as5.dir}"/> +  <generic-package-simple-portal server="${simple.tomcat.dir}"/> <copy todir="${simple.tomcat.dir}/simple-portal" flatten="true"> @@ -940,9 +1092,6 @@ <fileset dir="${simple.tomcat.dir}/simple-portal/"/> </move> -  -  - <delete file="${target}/portlet-test-lib.jar"/> <antcall target="__package-demo-portlets"/> @@ -1012,4 +1161,4 @@ </target> -</project> \ No newline at end of file +</project> Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestSuite.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestSuite.java 2008-08-27 20:26:54 UTC (rev 11752) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/PortletTestSuite.java 2008-08-27 20:59:49 UTC (rev 11753) @@ -65,6 +65,8 @@ /** . */ private ClassLoader loader; + + protected boolean testDriverSetup = false; /** * Finds all methods matching pattern in current instance and invokes them. Methods add Sequence into @@ -72,88 +74,98 @@ */ public void attributeAdded(ServletContextAttributeEvent event) { - if (event.getName().equals("TestDriverServer")) - { - RemoteTestDriverServer remoteDriver = (RemoteTestDriverServer)event.getValue(); + if (event.getName().equals("TestDriverServer") && event.getValue() instanceof RemoteTestDriverServer) + { + RemoteTestDriverServer remoteDriver = (RemoteTestDriverServer)event.getValue(); + ServletContext servletContext = event.getServletContext(); + setupRemoteDriver(servletContext, remoteDriver); + } + } + + /** + */ + public void setupRemoteDriver(ServletContext servletContext, RemoteTestDriverServer remoteDriver) + { - // It is only in servlet 2.5, for now we use reflection - String name = null; - try - { - Method m = ServletContext.class.getMethod("getContextPath"); - ServletContext servletContext = event.getServletContext(); - name = (String)m.invoke(servletContext); - name = name.substring(1); // We remove the leading '/' - } - catch (Exception e) - { - log.error("Cannot get application context path", e); - } + testDriverSetup = true; - // - if (name != null) - { - driver = new PortletTestDriver(name, remoteDriver); + // It is only in servlet 2.5, for now we use reflection + String name = null; + try + { + Method m = ServletContext.class.getMethod("getContextPath"); + name = (String)m.invoke(servletContext); + name = name.substring(1); // We remove the leading '/' + } + catch (Exception e) + { + log.error("Cannot get application context path", e); + } - // - try - { - for (Class clazz : getClasses(event.getServletContext())) - { - TestCase testCaseAnnotation = ((AnnotatedElement)clazz).getAnnotation(TestCase.class); + // + if (name != null) + { + driver = new PortletTestDriver(name, remoteDriver); - // - if (testCaseAnnotation != null) - { - boolean active = true; + // + try + { + for (Class clazz : getClasses(servletContext)) + { + TestCase testCaseAnnotation = ((AnnotatedElement)clazz).getAnnotation(TestCase.class); - // - for (Assertion assertion : testCaseAnnotation.value()) - { - if (assertion.getStatus() instanceof Assertion.Inactive) - { - active = false; - log.debug("Skip test case " + clazz.getName() + " because the assertion " + assertion.getRef() + " is not enabled"); - } - } + // + if (testCaseAnnotation != null) + { + boolean active = true; - // - if (active) - { - try - { - Constructor ctor = clazz.getConstructor(PortletTestCase.class); - PortletTestCase portletTestCase = new PortletTestCase(); - ctor.newInstance(portletTestCase); - String testCaseName = clazz.getSimpleName(); - driver.addTestCase(testCaseName, portletTestCase); - } - catch (Exception e) - { - log.error("Cannot obtain test case constructor " + clazz, e); - } - } - } - else - { - log.error("Skip test case " + clazz.getName() + " because it is not annotated as a test case"); - } - } - } - catch (IOException e) - { - log.error("Cannot get load test cases", e); - } + // + for (Assertion assertion : testCaseAnnotation.value()) + { + if (assertion.getStatus() instanceof Assertion.Inactive) + { + active = false; + log.debug("Skip test case " + clazz.getName() + " because the assertion " + assertion.getRef() + " is not enabled"); + } + } - // - driver.start(); + // + if (active) + { + try + { + Constructor ctor = clazz.getConstructor(PortletTestCase.class); + PortletTestCase portletTestCase = new PortletTestCase(); + ctor.newInstance(portletTestCase); + String testCaseName = clazz.getSimpleName(); + driver.addTestCase(testCaseName, portletTestCase); + } + catch (Exception e) + { + log.error("Cannot obtain test case constructor " + clazz, e); + } + } + } + else + { + log.error("Skip test case " + clazz.getName() + " because it is not annotated as a test case"); + } + } + } + catch (IOException e) + { + log.error("Cannot get load test cases", e); + } - // - event.getServletContext().setAttribute("SequenceRegistry", driver); - } - } + // + driver.start(); + + // + servletContext.setAttribute("SequenceRegistry", driver); + } } - + + protected List<Class> getClasses(ServletContext ctx) throws IOException { TestCaseScanner collector = new TestCaseScanner(loader, ctx); @@ -256,12 +268,23 @@ public void attributeReplaced(ServletContextAttributeEvent event) { - + } public void contextInitialized(ServletContextEvent sce) { loader = Thread.currentThread().getContextClassLoader(); + + // need to check if the testDriver has been already setup or not. + // Issues exist with JBoss AS 5 in which the listeners are not started before the attribute is added + // and thus the attributeAdded method never gets called (like it does for JBoss 4.2.x and Tomcat). + Object testDriverServer = sce.getServletContext().getAttribute("TestDriverServer"); + if (testDriverSetup == false && testDriverServer != null && testDriverServer instanceof RemoteTestDriverServer ) + { + RemoteTestDriverServer remoteDriver = (RemoteTestDriverServer)testDriverServer; + ServletContext servletContext = sce.getServletContext(); + setupRemoteDriver(servletContext, remoteDriver); + } } public void contextDestroyed(ServletContextEvent sce) Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-08-27 20:26:54 UTC (rev 11752) +++ modules/portlet/trunk/test/src/test/build.xml 2008-08-27 20:59:49 UTC (rev 11753) @@ -496,10 +496,6 @@  <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war"> <fileset dir="${target}/test-classes/portlet-test-war"/> - </copy> -  - <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war" overwrite="true"> <fileset dir="${target}/test-classes/jboss-5.0/portlet-test-war"/> </copy> <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war/WEB-INF/lib" flatten="true"> Deleted: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml 2008-08-27 20:26:54 UTC (rev 11752) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-tck-war/WEB-INF/web.xml 2008-08-27 20:59:49 UTC (rev 11753) @@ -1,49 +0,0 @@ -<?xml version="1.0"?> - - -<!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-beans-portal.xml</param-value> - </context-param> - <listener> - <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> - </listener> - <servlet> - <servlet-name>ContainerServlet</servlet-name> - <servlet-class>org.jboss.portal.web.impl.jboss.JB5ContainerServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet> - <servlet-name>PortalServlet</servlet-name> - <servlet-class>org.jboss.portal.portlet.test.tck.TCKServlet</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> Deleted: modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml 2008-08-27 20:26:54 UTC (rev 11752) +++ modules/portlet/trunk/test/src/test/resources/jboss-5.0/portlet-test-war/WEB-INF/web.xml 2008-08-27 20:59:49 UTC (rev 11753) @@ -1,49 +0,0 @@ -<?xml version="1.0"?> - - -<!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-beans-portal.xml</param-value> - </context-param> - <listener> - <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> - </listener> - <servlet> - <servlet-name>ContainerServlet</servlet-name> - <servlet-class>org.jboss.portal.web.impl.jboss.JB5ContainerServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet> - <servlet-name>PortalServlet</servlet-name> - <servlet-class>org.jboss.portal.portlet.test.PortalServlet</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app>

15 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits August 2008