Author: thomas.heute(a)jboss.com
Date: 2007-09-20 12:26:53 -0400 (Thu, 20 Sep 2007)
New Revision: 8385
Added:
modules/portlet/trunk/.classpath
modules/portlet/trunk/.project
modules/portlet/trunk/.settings/
modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs
modules/portlet/trunk/build/local.properties
modules/test/trunk/.classpath
modules/test/trunk/.project
modules/test/trunk/.settings/
modules/test/trunk/.settings/org.eclipse.jdt.core.prefs
modules/web/trunk/.classpath
modules/web/trunk/.project
modules/web/trunk/.settings/
modules/web/trunk/.settings/org.eclipse.jdt.core.prefs
Modified:
modules/common/trunk/.classpath
modules/common/trunk/.project
modules/common/trunk/mc/
modules/common/trunk/portal/
modules/identity/trunk/.classpath
modules/identity/trunk/.project
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/DBIdentityLoginModule.java
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java
modules/portlet/trunk/
modules/portlet/trunk/bridge/
modules/portlet/trunk/federation/
modules/portlet/trunk/jsr168api/
modules/portlet/trunk/management/
modules/portlet/trunk/portlet/
modules/portlet/trunk/portlet/src/resources/test/deployment/portlet.xml
modules/portlet/trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml
modules/portlet/trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml
modules/portlet/trunk/test/
modules/test/trunk/
modules/test/trunk/build/
modules/test/trunk/test/
modules/web/trunk/
modules/web/trunk/build/
modules/web/trunk/web/
Log:
- Update Eclipse classpath
- Fix portlet.xml so that they are valid against the DTD
(It passes the testsuite)
Modified: modules/common/trunk/.classpath
===================================================================
--- modules/common/trunk/.classpath 2007-09-20 12:47:58 UTC (rev 8384)
+++ modules/common/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385)
@@ -1,19 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="common/src/main"/>
- <classpathentry kind="lib"
path="/thirdparty/apache-ant/lib/ant.jar"/>
- <classpathentry kind="lib"
path="/tools/lib/cargo-core-uberjar-0.8.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/apache-log4j/lib/log4j.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/junit/lib/junit.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
- <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/sun-jaf/lib/activation.jar"/>
+ <classpathentry kind="src" path="mc/src/main/java"/>
+ <classpathentry kind="src" path="portal/src/main/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"
sourcepath="/JBoss_AS_4.0.5/jmx/src/main"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: modules/common/trunk/.project
===================================================================
--- modules/common/trunk/.project 2007-09-20 12:47:58 UTC (rev 8384)
+++ modules/common/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>common_module</name>
+ <name>module-common</name>
<comment></comment>
<projects>
</projects>
Property changes on: modules/common/trunk/mc
___________________________________________________________________
Name: svn:ignore
+ output
Property changes on: modules/common/trunk/portal
___________________________________________________________________
Name: svn:ignore
+ output
Modified: modules/identity/trunk/.classpath
===================================================================
--- modules/identity/trunk/.classpath 2007-09-20 12:47:58 UTC (rev 8384)
+++ modules/identity/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385)
@@ -1,19 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="identity/src/main"/>
+ <classpathentry kind="src" path="sso/src/main"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jbosssx.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/hibernate/lib/hibernate3.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/junit/lib/junit.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/apache-log4j/lib/log4j.jar"/>
- <classpathentry kind="lib"
path="/thirdparty/sun-opends/lib/OpenDS.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/apache-tomcat/lib/catalina.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/cas/lib/cas-server-3.0.7.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/opensso/lib/amclientsdk.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/spring/lib/spring-2.0.3.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/hibernate/lib/hibernate3.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/cas/lib/casclient.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/josso/lib/josso-1.5.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/josso/lib/josso-tomcat55-plugin-1.5.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jbosssx.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/sun-opends/lib/OpenDS.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: modules/identity/trunk/.project
===================================================================
--- modules/identity/trunk/.project 2007-09-20 12:47:58 UTC (rev 8384)
+++ modules/identity/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>identity-module</name>
+ <name>module-identity</name>
<comment></comment>
<projects>
</projects>
Modified:
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/DBIdentityLoginModule.java
===================================================================
---
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/DBIdentityLoginModule.java 2007-09-20
12:47:58 UTC (rev 8384)
+++
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/DBIdentityLoginModule.java 2007-09-20
16:26:53 UTC (rev 8385)
@@ -21,17 +21,16 @@
*/
package org.jboss.portal.identity.auth;
-import org.jboss.security.auth.spi.DatabaseServerLoginModule;
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.Map;
import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
import javax.security.auth.callback.CallbackHandler;
-import java.util.Map;
-import java.util.Collections;
-import java.util.Arrays;
-import java.security.Principal;
-import java.security.acl.Group;
+import javax.security.auth.login.LoginException;
+import org.jboss.security.auth.spi.DatabaseServerLoginModule;
+
/**
* @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw
Dawidowicz</a>
* @version $Revision: 1.1 $
Modified:
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java
===================================================================
---
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java 2007-09-20
12:47:58 UTC (rev 8384)
+++
modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java 2007-09-20
16:26:53 UTC (rev 8385)
@@ -70,9 +70,6 @@
private MembershipModule membershipModule;
private UserProfileModule userProfileModule;
- private String userName;
- private String password;
-
public void initialize(Subject subject, CallbackHandler callbackHandler, Map
sharedState, Map options)
{
super.initialize(subject, callbackHandler, sharedState, options);
Property changes on: modules/portlet/trunk
___________________________________________________________________
Name: svn:ignore
+ thirdparty
Added: modules/portlet/trunk/.classpath
===================================================================
--- modules/portlet/trunk/.classpath (rev 0)
+++ modules/portlet/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="portlet/src/main"/>
+ <classpathentry kind="src" path="bridge/src/main"/>
+ <classpathentry kind="src" path="federation/src/main"/>
+ <classpathentry kind="src" path="jsr168api/src/main"/>
+ <classpathentry kind="src" path="management/src/main"/>
+ <classpathentry kind="src" path="test/src/main"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="lib"
path="/thirdparty/sun-jaf/lib/activation.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/sun-servlet/lib/jsp-api.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/portals-bridges/lib/portals-bridges-common.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: modules/portlet/trunk/.project
===================================================================
--- modules/portlet/trunk/.project (rev 0)
+++ modules/portlet/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>module-portlet</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs
(rev 0)
+++ modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs 2007-09-20 16:26:53 UTC
(rev 8385)
@@ -0,0 +1,12 @@
+#Wed Sep 12 11:19:13 CEST 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
Property changes on: modules/portlet/trunk/bridge
___________________________________________________________________
Name: svn:ignore
+ output
Added: modules/portlet/trunk/build/local.properties
===================================================================
--- modules/portlet/trunk/build/local.properties (rev 0)
+++ modules/portlet/trunk/build/local.properties 2007-09-20 16:26:53 UTC (rev 8385)
@@ -0,0 +1,48 @@
+### ====================================================================== ###
+## ##
+## Local project properties. ##
+## ##
+## Define properties that are local to your environment here. This ##
+## file (local.properties) should not be checked in. Modify the ##
+## example to affect all users. ##
+## ##
+### ====================================================================== ###
+
+### General compiler configuration ###
+
+#build.compiler=jikes
+#build.warnings=true
+#build.pedantic=true
+#javac.depend=on
+
+### Javac/Jikes compiler configuration ###
+
+javac.optimize=off
+javac.debug=on
+javac.deprecation=on
+
+### Enable verbose build output ###
+
+#init.verbose=true
+
+### JavaDoc ###
+#docs-javadocs.disable=true
+
+### Do we build xdoclet or get it from thirdparty ###
+### uncomment for thirdparty: comment to use xdoclet module.
+### To use xdoclet module also uncomment the xdoclet line in groups in build/build.xml
+#xdoclet.xdoclet.root=${project.root}/thirdparty/xdoclet
+
+# Portal database, for now : hsqldb, mysql, postgresql are the possible values
+portal.database=mysql
+# The datasource name used in the JNDI binding
+portal.datasource.name=PortalDS
+# Context root for the portal main servlet
+portal.web.context-root=/portal
+# JBoss server/<xxx> directory for JBoss Portal, ie: $JBOSS_HOME/server/default
+portal.deploy.dir=default/deploy
+portal-ha.deploy.dir=all/deploy
+# Show SQL or not
+portal.sql.show=false
+# Uncomment if you want to use a specific JBoss home path otherwise the build will use
the JBOSS_HOME env variable
+#jboss.home=
Property changes on: modules/portlet/trunk/federation
___________________________________________________________________
Name: svn:ignore
+ output
Property changes on: modules/portlet/trunk/jsr168api
___________________________________________________________________
Name: svn:ignore
+ output
Property changes on: modules/portlet/trunk/management
___________________________________________________________________
Name: svn:ignore
+ output
Property changes on: modules/portlet/trunk/portlet
___________________________________________________________________
Name: svn:ignore
+ output
Modified: modules/portlet/trunk/portlet/src/resources/test/deployment/portlet.xml
===================================================================
--- modules/portlet/trunk/portlet/src/resources/test/deployment/portlet.xml 2007-09-20
12:47:58 UTC (rev 8384)
+++ modules/portlet/trunk/portlet/src/resources/test/deployment/portlet.xml 2007-09-20
16:26:53 UTC (rev 8385)
@@ -265,24 +265,6 @@
</portlet>
-->
- <security-constraint>
- <portlet-collection>
- <portlet-name>Portlet1</portlet-name>
- </portlet-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint>
- <portlet-collection>
- <portlet-name>Portlet1</portlet-name>
- <portlet-name>Portlet4</portlet-name>
- </portlet-collection>
- <user-data-constraint>
- <transport-guarantee>INTEGRAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
<custom-portlet-mode>
<description>first mode</description>
<description xml:lang="fr">premier mode</description>
@@ -310,4 +292,23 @@
<description>second attribute</description>
<name>att2</name>
</user-attribute>
+
+ <security-constraint>
+ <portlet-collection>
+ <portlet-name>Portlet1</portlet-name>
+ </portlet-collection>
+ <user-data-constraint>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+ <security-constraint>
+ <portlet-collection>
+ <portlet-name>Portlet1</portlet-name>
+ <portlet-name>Portlet4</portlet-name>
+ </portlet-collection>
+ <user-data-constraint>
+ <transport-guarantee>INTEGRAL</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
</portlet-app>
Modified:
modules/portlet/trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml
===================================================================
---
modules/portlet/trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml 2007-09-20
12:47:58 UTC (rev 8384)
+++
modules/portlet/trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml 2007-09-20
16:26:53 UTC (rev 8385)
@@ -21,12 +21,8 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<portlet-app>
-<portlet-app
xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1...
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
- version="1.0">
-
<portlet>
<portlet-name>UniversalTestPortletA</portlet-name>
<session-config>
Modified:
modules/portlet/trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml
===================================================================
---
modules/portlet/trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml 2007-09-20
12:47:58 UTC (rev 8384)
+++
modules/portlet/trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml 2007-09-20
16:26:53 UTC (rev 8385)
@@ -71,7 +71,7 @@
<short-title>short-title</short-title>
<keywords>keywords</keywords>
</portlet-info>
- <portlet-preference>
+ <portlet-preferences>
<preference>
<name>localized_pref</name>
<value>std_localized_value</value>
@@ -96,12 +96,13 @@
<value>multi_pref_value_2</value>
<read-only>true</read-only>
</preference>
- </portlet-preference>
+ </portlet-preferences>
</portlet>
<portlet>
<portlet-name>CachePortlet</portlet-name>
<portlet-class>org.jboss.portal.test.portlet.info.universal.SimplePortlet</portlet-class>
+ <expiration-cache>65</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
</supports>
@@ -110,7 +111,6 @@
<short-title>short-title</short-title>
<keywords>keywords</keywords>
</portlet-info>
- <expiration-cache>65</expiration-cache>
</portlet>
<portlet>
Modified:
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml
===================================================================
---
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml 2007-09-20
12:47:58 UTC (rev 8384)
+++
modules/portlet/trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml 2007-09-20
16:26:53 UTC (rev 8385)
@@ -41,9 +41,6 @@
<portlet>
<portlet-name>TestUniversalPortletB</portlet-name>
<portlet-class>org.jboss.portal.test.portlet.framework.UTP2</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
<init-param>
<name>InitParamA</name>
<value>InitParamAValue</value>
@@ -52,6 +49,9 @@
<name>InitParamB</name>
<value>InitParamBValue</value>
</init-param>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
<portlet-info>
<title></title>
</portlet-info>
Modified:
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml
===================================================================
---
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml 2007-09-20
12:47:58 UTC (rev 8384)
+++
modules/portlet/trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml 2007-09-20
16:26:53 UTC (rev 8385)
@@ -34,10 +34,6 @@
<supports>
<mime-type>text/html</mime-type>
</supports>
- <custom-window-state>
- <description>Some unmapped by portal state</description>
- <name>UNMAPPED_STATE</name>
- </custom-window-state>
<portlet-info>
<title></title>
</portlet-info>
@@ -54,6 +50,10 @@
</portlet-info>
</portlet>
+ <custom-window-state>
+ <description>Some unmapped by portal state</description>
+ <window-state>UNMAPPED_STATE</window-state>
+ </custom-window-state>
</portlet-app>
Property changes on: modules/portlet/trunk/test
___________________________________________________________________
Name: svn:ignore
+ output
Property changes on: modules/test/trunk
___________________________________________________________________
Name: svn:ignore
+ thirdparty
Added: modules/test/trunk/.classpath
===================================================================
--- modules/test/trunk/.classpath (rev 0)
+++ modules/test/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="test/src/main"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="lib"
path="thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
+ <classpathentry kind="lib"
path="test/selenium-java-client-driver.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-jca.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-local-jdbc.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/hibernate/lib/hibernate3.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jnp-client.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jnpserver.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-transaction.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/sun-opends/lib/OpenDS.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/codehaus/cargo/lib/cargo-core-uberjar-0.9.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: modules/test/trunk/.project
===================================================================
--- modules/test/trunk/.project (rev 0)
+++ modules/test/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>module-test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: modules/test/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- modules/test/trunk/.settings/org.eclipse.jdt.core.prefs (rev
0)
+++ modules/test/trunk/.settings/org.eclipse.jdt.core.prefs 2007-09-20 16:26:53 UTC (rev
8385)
@@ -0,0 +1,12 @@
+#Thu Sep 20 15:11:39 CEST 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
Property changes on: modules/test/trunk/build
___________________________________________________________________
Name: svn:ignore
+ local.properties
Property changes on: modules/test/trunk/test
___________________________________________________________________
Name: svn:ignore
+ output
Property changes on: modules/web/trunk
___________________________________________________________________
Name: svn:ignore
+ thirdparty
Added: modules/web/trunk/.classpath
===================================================================
--- modules/web/trunk/.classpath (rev 0)
+++ modules/web/trunk/.classpath 2007-09-20 16:26:53 UTC (rev 8385)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="web/src/main"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="lib"
path="thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/apache-tomcat/lib/catalina.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/apache-tomcat/lib/tomcat-util.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: modules/web/trunk/.project
===================================================================
--- modules/web/trunk/.project (rev 0)
+++ modules/web/trunk/.project 2007-09-20 16:26:53 UTC (rev 8385)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>module-web</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: modules/web/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- modules/web/trunk/.settings/org.eclipse.jdt.core.prefs (rev
0)
+++ modules/web/trunk/.settings/org.eclipse.jdt.core.prefs 2007-09-20 16:26:53 UTC (rev
8385)
@@ -0,0 +1,12 @@
+#Thu Sep 20 15:12:51 CEST 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
Property changes on: modules/web/trunk/build
___________________________________________________________________
Name: svn:ignore
+ local.properties
Property changes on: modules/web/trunk/web
___________________________________________________________________
Name: svn:ignore
+ output