You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2005/08/29 14:09:12 UTC
svn commit: r264121 [3/6] - in
/portals/jetspeed-2/branches/SummersOfCode-2005:
app-servers/security/jboss/ app-servers/security/jboss/src/java/META-INF/
app-servers/security/jboss/src/java/META-INF/jboss-secsvc/
app-servers/security/jboss/src/java/org...
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/java/org/apache/portals/applications/transform/impl/JetspeedTransform.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/java/org/apache/portals/applications/transform/impl/JetspeedTransform.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/java/org/apache/portals/applications/transform/impl/JetspeedTransform.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/java/org/apache/portals/applications/transform/impl/JetspeedTransform.java Mon Aug 29 05:04:38 2005
@@ -142,7 +142,7 @@
{
try
{ // if no stylesheet specified simply drain the stream
- Streams.drain(inputSource.getByteStream(), writer);
+ Streams.drain(inputSource.getCharacterStream(), writer);
}
catch (IOException e)
{
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/java/org/apache/portals/applications/util/Streams.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/java/org/apache/portals/applications/util/Streams.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/java/org/apache/portals/applications/util/Streams.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/java/org/apache/portals/applications/util/Streams.java Mon Aug 29 05:04:38 2005
@@ -78,6 +78,12 @@
}
+ /**
+ * @deprecated encoding?
+ * @param r character reader
+ * @param os byte stream
+ * @throws IOException
+ */
public static void drain(Reader r,OutputStream os) throws IOException
{
Writer w=new OutputStreamWriter(os);
@@ -85,6 +91,12 @@
w.flush();
}
+ /**
+ * @deprecated how can it know the encoding?
+ * @param is input stream (encoding?)
+ * @param w writer
+ * @throws IOException
+ */
public static void drain(InputStream is, Writer w) throws IOException
{
Reader r = new InputStreamReader(is);
@@ -99,6 +111,11 @@
return bytes.toByteArray();
}
+ /**
+ * @deprecated encoding?
+ * @param is input stream
+ * @return
+ */
public static String getAsString(InputStream is)
{
int c=0;
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/webapp/WEB-INF/portlet.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/applications/rss/src/webapp/WEB-INF/portlet.xml Mon Aug 29 05:04:38 2005
@@ -56,6 +56,7 @@
<portlet-mode>VIEW</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
+ <supported-locale>es</supported-locale>
<supported-locale>fr</supported-locale>
<resource-bundle>org.apache.portals.applications.rss.resources.RssResources</resource-bundle>
<portlet-info>
@@ -87,6 +88,10 @@
<preference>
<name>showtextinput</name>
<value>true</value>
+ </preference>
+ <preference>
+ <name>minrefresh</name>
+ <value>3600</value>
</preference>
</portlet-preferences>
</portlet>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/LoginResources.properties Mon Aug 29 05:04:38 2005
@@ -15,6 +15,10 @@
# $Id$
#
+# portlet info
+javax.portlet.title=Login Portlet
+javax.portlet.short-title=Login Portlet
+
# login.jsp
login.label.Login=Login
login.label.Welcome=Welcome {0}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java Mon Aug 29 05:04:38 2005
@@ -41,12 +41,11 @@
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.container.JetspeedPortletContext;
+import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.common.UserAttribute;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.om.page.Property;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.portlets.security.SecurityResources;
import org.apache.jetspeed.portlets.security.SecurityUtil;
@@ -1025,6 +1024,7 @@
// create user's home page and folder
Folder folder = pageManager.newFolder(Folder.USER_FOLDER + userName);
+ setSecurityConstraints(folder, userName);
pageManager.updateFolder(folder);
String templateFolder = actionRequest.getPreferences().getValue("newUserTemplateDirectory", "/_user/template/");
@@ -1051,5 +1051,10 @@
}
}
-
+ private void setSecurityConstraints(Folder folder, String userName)
+ {
+ SecurityConstraints constraints = pageManager.newSecurityConstraints();
+ constraints.setOwner(userName);
+ folder.setSecurityConstraints(constraints);
+ }
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/webapp/WEB-INF/portlet.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/webapp/WEB-INF/portlet.xml Mon Aug 29 05:04:38 2005
@@ -36,6 +36,27 @@
<short-title>Login</short-title>
</portlet-info>
</portlet>
+ <portlet id="LoginPortletForXHTMLBasic">
+ <init-param>
+ <name>ViewPage</name>
+ <value>/WEB-INF/security/login/login-xhtmlbasic.jsp</value>
+ </init-param>
+ <portlet-name>LoginPortletForXHTMLBasic</portlet-name>
+ <display-name>Login for XHTML Basic</display-name>
+ <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>ja</supported-locale>
+ <resource-bundle>org.apache.jetspeed.portlets.security.resources.LoginResources</resource-bundle>
+ <portlet-info>
+ <title>Login</title>
+ <short-title>Login</short-title>
+ </portlet-info>
+ </portlet>
<!-- *********************** -->
<!-- Role Management Portlet -->
<!-- *********************** -->
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/webapp/WEB-INF/security/login/login.jsp
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/webapp/WEB-INF/security/login/login.jsp?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/webapp/WEB-INF/security/login/login.jsp (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/applications/security/src/webapp/WEB-INF/security/login/login.jsp Mon Aug 29 05:04:38 2005
@@ -25,9 +25,9 @@
<c:choose>
<c:when test="${pageContext.request.userPrincipal != null}">
- <fmt:message key="login.label.Welcome"><fmt:param><c:out value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br>
+ <fmt:message key="login.label.Welcome"><fmt:param><c:out value="${pageContext.request.userPrincipal.name}"/></fmt:param></fmt:message><br />
<a href='<c:url context="${requestContext.request.contextPath}" value="/login/logout"/>'><fmt:message key="login.label.Logout"/></a>
- <br>
+ <br />
<a href='<c:url context="${requestContext.request.contextPath}" value="/portal/my-account.psml"/>'><fmt:message key="login.label.ChangePassword"/></a>
</c:when>
<c:otherwise>
@@ -35,16 +35,16 @@
<c_rt:set var="errorCode" value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.ERRORCODE)%>"/>
<c:choose>
<c:when test="${not empty errorCode}">
- <br>
+ <br />
<i><fmt:message key="login.label.ErrorCode.${errorCode}"/></i>
- <br>
+ <br />
</c:when>
<c:otherwise>
<c_rt:set var="retryCount" value="<%=((RequestContext)request.getAttribute(RequestContext.REQUEST_PORTALENV)).getSessionAttribute(LoginConstants.RETRYCOUNT)%>"/>
<c:if test="${not empty retryCount}">
- <br>
+ <br />
<i><fmt:message key="login.label.InvalidUsernameOrPassword"><fmt:param value="${retryCount}"/></fmt:message></i>
- <br>
+ <br />
</c:if>
</c:otherwise>
</c:choose>
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml Mon Aug 29 05:04:38 2005
@@ -1,210 +1,210 @@
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<!--
- - C A P A B I L I T Y M A P P I N G
--->
-
-<descriptor-repository version="1.0">
-<!--
- - M E D I A T Y P E
- -->
- <class-descriptor
- class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl"
- table="MEDIA_TYPE"
- >
-
- <field-descriptor
- name="mediatypeId"
- column="MEDIATYPE_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="characterSet"
- column="CHARACTER_SET"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="title"
- column="TITLE"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="description"
- column="DESCRIPTION"
- jdbc-type="VARCHAR"
- />
-
- <collection-descriptor
- name="capabilities"
- element-class-ref="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
- auto-retrieve="true"
- indirection-table="CLIENT_TO_CAPABILITY"
- >
- <fk-pointing-to-this-class column="CLIENT_ID"/>
- <fk-pointing-to-element-class column="CAPABILITY_ID"/>
- </collection-descriptor>
-
- <collection-descriptor
- name="mimetypes"
- element-class-ref="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
- auto-retrieve="true"
- indirection-table="MEDIATYPE_TO_MIMETYPE"
- >
- <fk-pointing-to-this-class column="MEDIATYPE_ID"/>
- <fk-pointing-to-element-class column="MIMETYPE_ID"/>
- </collection-descriptor>
-
- </class-descriptor>
-
- <!--
- - C L I E N T
- -->
- <class-descriptor
- class="org.apache.jetspeed.capabilities.impl.ClientImpl"
- table="CLIENT"
- >
- <field-descriptor
- name="clientId"
- column="CLIENT_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
- <field-descriptor
- name="evalOrder"
- column="EVAL_ORDER"
- jdbc-type="INTEGER"
- />
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="userAgentPattern"
- column="USER_AGENT_PATTERN"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="manufacturer"
- column="MANUFACTURER"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="model"
- column="MODEL"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="version"
- column="VERSION"
- jdbc-type="VARCHAR"
- />
-
- <field-descriptor
- name="preferredMimeTypeId"
- column="PREFERRED_MIMETYPE_ID"
- jdbc-type="INTEGER"
- />
-
- <collection-descriptor
- name="capabilities"
- element-class-ref="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
-
- indirection-table="CLIENT_TO_CAPABILITY"
- >
- <fk-pointing-to-this-class column="CLIENT_ID"/>
- <fk-pointing-to-element-class column="CAPABILITY_ID"/>
- </collection-descriptor>
-
- <collection-descriptor
- name="mimetypes"
- element-class-ref="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
- auto-retrieve="true"
- indirection-table="CLIENT_TO_MIMETYPE"
- >
- <fk-pointing-to-this-class column="CLIENT_ID"/>
- <fk-pointing-to-element-class column="MIMETYPE_ID"/>
- </collection-descriptor>
-
- </class-descriptor>
-
-<!--
- - M I M E T Y P E
- -->
- <class-descriptor
- class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
- table="MIMETYPE"
- >
- <field-descriptor
- name="mimeTypeId"
- column="MIMETYPE_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
-
- <field-descriptor
- name="name"
- column="NAME"
- jdbc-type="VARCHAR"
- />
- </class-descriptor>
-
-<!--
- - C A P A B I L I T Y
- -->
- <class-descriptor
- class="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
- table="CAPABILITY"
- >
- <field-descriptor
- name="capabilityId"
- column="CAPABILITY_ID"
- jdbc-type="INTEGER"
- primarykey="true"
- autoincrement="true"
- />
-
- <field-descriptor
- name="name"
- column="CAPABILITY"
- jdbc-type="VARCHAR"
- />
-
- </class-descriptor>
-
-</descriptor-repository>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!--
+ - C A P A B I L I T Y M A P P I N G
+-->
+
+<descriptor-repository version="1.0">
+<!--
+ - M E D I A T Y P E
+ -->
+ <class-descriptor
+ class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl"
+ table="MEDIA_TYPE"
+ >
+
+ <field-descriptor
+ name="mediatypeId"
+ column="MEDIATYPE_ID"
+ jdbc-type="INTEGER"
+ primarykey="true"
+ autoincrement="true"
+ />
+
+ <field-descriptor
+ name="name"
+ column="NAME"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="characterSet"
+ column="CHARACTER_SET"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="title"
+ column="TITLE"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="description"
+ column="DESCRIPTION"
+ jdbc-type="VARCHAR"
+ />
+
+ <collection-descriptor
+ name="capabilities"
+ element-class-ref="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
+ auto-retrieve="true"
+ indirection-table="CLIENT_TO_CAPABILITY"
+ >
+ <fk-pointing-to-this-class column="CLIENT_ID"/>
+ <fk-pointing-to-element-class column="CAPABILITY_ID"/>
+ </collection-descriptor>
+
+ <collection-descriptor
+ name="mimetypes"
+ element-class-ref="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
+ auto-retrieve="true"
+ indirection-table="MEDIATYPE_TO_MIMETYPE"
+ >
+ <fk-pointing-to-this-class column="MEDIATYPE_ID"/>
+ <fk-pointing-to-element-class column="MIMETYPE_ID"/>
+ </collection-descriptor>
+
+ </class-descriptor>
+
+ <!--
+ - C L I E N T
+ -->
+ <class-descriptor
+ class="org.apache.jetspeed.capabilities.impl.ClientImpl"
+ table="CLIENT"
+ >
+ <field-descriptor
+ name="clientId"
+ column="CLIENT_ID"
+ jdbc-type="INTEGER"
+ primarykey="true"
+ autoincrement="true"
+ />
+
+ <field-descriptor
+ name="evalOrder"
+ column="EVAL_ORDER"
+ jdbc-type="INTEGER"
+ />
+
+ <field-descriptor
+ name="name"
+ column="NAME"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="userAgentPattern"
+ column="USER_AGENT_PATTERN"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="manufacturer"
+ column="MANUFACTURER"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="model"
+ column="MODEL"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="version"
+ column="VERSION"
+ jdbc-type="VARCHAR"
+ />
+
+ <field-descriptor
+ name="preferredMimeTypeId"
+ column="PREFERRED_MIMETYPE_ID"
+ jdbc-type="INTEGER"
+ />
+
+ <collection-descriptor
+ name="capabilities"
+ element-class-ref="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
+
+ indirection-table="CLIENT_TO_CAPABILITY"
+ >
+ <fk-pointing-to-this-class column="CLIENT_ID"/>
+ <fk-pointing-to-element-class column="CAPABILITY_ID"/>
+ </collection-descriptor>
+
+ <collection-descriptor
+ name="mimetypes"
+ element-class-ref="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
+ auto-retrieve="true"
+ indirection-table="CLIENT_TO_MIMETYPE"
+ >
+ <fk-pointing-to-this-class column="CLIENT_ID"/>
+ <fk-pointing-to-element-class column="MIMETYPE_ID"/>
+ </collection-descriptor>
+
+ </class-descriptor>
+
+<!--
+ - M I M E T Y P E
+ -->
+ <class-descriptor
+ class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl"
+ table="MIMETYPE"
+ >
+ <field-descriptor
+ name="mimeTypeId"
+ column="MIMETYPE_ID"
+ jdbc-type="INTEGER"
+ primarykey="true"
+ autoincrement="true"
+ />
+
+
+ <field-descriptor
+ name="name"
+ column="NAME"
+ jdbc-type="VARCHAR"
+ />
+ </class-descriptor>
+
+<!--
+ - C A P A B I L I T Y
+ -->
+ <class-descriptor
+ class="org.apache.jetspeed.capabilities.impl.CapabilityImpl"
+ table="CAPABILITY"
+ >
+ <field-descriptor
+ name="capabilityId"
+ column="CAPABILITY_ID"
+ jdbc-type="INTEGER"
+ primarykey="true"
+ autoincrement="true"
+ />
+
+ <field-descriptor
+ name="name"
+ column="CAPABILITY"
+ jdbc-type="VARCHAR"
+ />
+
+ </class-descriptor>
+
+</descriptor-repository>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/capability/src/java/JETSPEED-INF/ojb/capabilities_repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/cm/src/java/org/apache/jetspeed/testhelpers/AbstractTestHelper.java Mon Aug 29 05:04:38 2005
@@ -78,7 +78,7 @@
String prop = System.getProperty(key);
if (prop == null)
{
- return (String) USER_PROPERTIES.getProperty(key);
+ return USER_PROPERTIES.getString(key);
}
else
{
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml Mon Aug 29 05:04:38 2005
@@ -25,7 +25,7 @@
</field>
<field name="defaults"
- type="org.apache.jetspeed.om.page.psml.Defaults">
+ type="org.apache.jetspeed.om.page.psml.DefaultsImpl">
<bind-xml name="defaults"/>
</field>
@@ -356,7 +356,7 @@
</field>
</class>
- <class name="org.apache.jetspeed.om.page.psml.Defaults">
+ <class name="org.apache.jetspeed.om.page.psml.DefaultsImpl">
<map-to xml="defaults"/>
<field name="skin" type="java.lang.String">
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java Mon Aug 29 05:04:38 2005
@@ -1,14 +1,15 @@
package org.apache.jetspeed.om.page.psml;
import java.util.HashMap;
-import java.util.Locale;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.ContentPage;
+import org.apache.jetspeed.om.page.Defaults;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.document.Node;
@@ -373,5 +374,10 @@
public Page getPage()
{
return page;
+ }
+
+ public Defaults getDefaults()
+ {
+ return page.getDefaults();
}
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java Mon Aug 29 05:04:38 2005
@@ -21,6 +21,7 @@
import java.util.Stack;
import org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl;
+import org.apache.jetspeed.om.page.Defaults;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.document.AbstractNode;
@@ -30,7 +31,7 @@
*/
public class PageImpl extends AbstractNode implements Page
{
- private Defaults defaults = new Defaults();
+ private DefaultsImpl defaults = new DefaultsImpl();
private Fragment root = null;
@@ -166,7 +167,7 @@
return this.defaults;
}
- public void setDefaults( Defaults defaults )
+ public void setDefaults( DefaultsImpl defaults )
{
this.defaults = defaults;
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java Mon Aug 29 05:04:38 2005
@@ -791,7 +791,7 @@
}
// compare control and navigation locator properties
- if ((properties0 != null) && (properties1 != null))
+ try
{
for (int i = 0, limit = properties0.length; (i < limit); i++)
{
@@ -806,6 +806,9 @@
return false;
}
}
+ } catch(Throwable t) {
+ t.printStackTrace();
+ return false;
}
}
return true;
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_es.properties Mon Aug 29 05:04:38 2005
@@ -13,5 +13,5 @@
# limitations under the License.
## menu separators
-menu.separator.folders=[es]Carpetas
-menu.separator.links=[es]Otros enlaces
+menu.separator.folders=Carpetas
+menu.separator.links=Otros enlaces
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_es.properties Mon Aug 29 05:04:38 2005
@@ -13,5 +13,5 @@
# limitations under the License.
## menu titles
-menu.title.back=[es]Retroceder a
-menu.title.breadcrumbs=[es]Est\u00e1 aqu\u00ed:
+menu.title.back=Atr\u00e1s
+menu.title.breadcrumbs=Est\u00e1 aqu\u00ed:
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ja.properties Mon Aug 29 05:04:38 2005
@@ -14,4 +14,4 @@
## menu titles
menu.title.back=\u00bb
-menu.title.breadcrumbs=\u00bb
+menu.title.breadcrumbs=\u73fe\u5728\u30d1\u30b9\uff1a
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml Mon Aug 29 05:04:38 2005
@@ -1,131 +1,131 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<!--
-Copyright 2005 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<!-- Portal Site Test Spring Configuration-->
-<beans>
-
- <!-- IDGenerator -->
- <bean id="IdGenerator"
- class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop" >
- <!-- ID Start value -->
- <constructor-arg index="0"><value>65536</value></constructor-arg>
- <!-- ID Prefix -->
- <constructor-arg index="1"><value>P-</value></constructor-arg>
- <!-- ID Suffix -->
- <constructor-arg index="2"><value></value></constructor-arg>
- </bean>
-
- <!-- PageFileCache -->
- <bean id="PageFileCache"
- class="org.apache.jetspeed.cache.file.FileCache"
- init-method="startFileScanner"
- destroy-method="stopFileScanner">
- <!-- Scan rate for changes in cached files on the file system -->
- <constructor-arg index="0"><value>10</value></constructor-arg>
- <!-- Cache size -->
- <constructor-arg index="1"><value>100</value></constructor-arg>
- </bean>
-
- <!-- DocumentHandlerFactory -->
- <bean id="PsmlDocumentHandler"
- class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
- <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
- <constructor-arg index="1"><value>.psml</value></constructor-arg>
- <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Page</value></constructor-arg>
- <constructor-arg index="3" ><value>target/testdata/pages</value></constructor-arg>
- <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <bean id="LinkDocumentHandler"
- class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
- <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
- <constructor-arg index="1"><value>.link</value></constructor-arg>
- <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Link</value></constructor-arg>
- <constructor-arg index="3" ><value>target/testdata/pages</value></constructor-arg>
- <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <bean id="FolderMetaDataDocumentHandler"
- class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
- <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
- <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
- <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.FolderMetaData</value></constructor-arg>
- <constructor-arg index="3" ><value>target/testdata/pages</value></constructor-arg>
- <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <bean id="PageSecurityDocumentHandler"
- class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
- <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
- <constructor-arg index="1"><value>page.security</value></constructor-arg>
- <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.PageSecurity</value></constructor-arg>
- <constructor-arg index="3" ><value>target/testdata/pages</value></constructor-arg>
- <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <bean id="DocumentHandlerFactory"
- class="org.apache.jetspeed.page.document.DocumentHandlerFactoryImpl" >
- <constructor-arg>
- <map>
- <entry key=".psml">
- <ref bean="PsmlDocumentHandler" />
- </entry>
- <entry key=".link">
- <ref bean="LinkDocumentHandler" />
- </entry>
- <entry key="folder.metadata">
- <ref bean="FolderMetaDataDocumentHandler" />
- </entry>
- <entry key="page.security">
- <ref bean="PageSecurityDocumentHandler" />
- </entry>
- </map>
- </constructor-arg>
- </bean>
-
- <!-- FolderHandler -->
- <bean id="FolderHandler"
- class="org.apache.jetspeed.page.document.FileSystemFolderHandler" >
- <constructor-arg index="0"><value>target/testdata/pages</value></constructor-arg>
- <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
- <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>
- </bean>
-
- <!-- PageManager -->
- <bean id="org.apache.jetspeed.page.PageManager"
- name="pageManager"
- class="org.apache.jetspeed.page.impl.CastorXmlPageManager">
- <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
- <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
- <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
- <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>
- <!-- permissions security enabled flag, default=false -->
- <constructor-arg index="4"><value>false</value></constructor-arg>
- <!-- constraints security enabled flag, default=true -->
- <constructor-arg index="5"><value>false</value></constructor-arg>
- </bean>
-
- <!-- PortalSite -->
- <bean id="org.apache.jetspeed.portalsite.PortalSite"
- name="portalSite"
- class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">
- <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
- </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+Copyright 2005 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!-- Portal Site Test Spring Configuration-->
+<beans>
+
+ <!-- IDGenerator -->
+ <bean id="IdGenerator"
+ class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop" >
+ <!-- ID Start value -->
+ <constructor-arg index="0"><value>65536</value></constructor-arg>
+ <!-- ID Prefix -->
+ <constructor-arg index="1"><value>P-</value></constructor-arg>
+ <!-- ID Suffix -->
+ <constructor-arg index="2"><value></value></constructor-arg>
+ </bean>
+
+ <!-- PageFileCache -->
+ <bean id="PageFileCache"
+ class="org.apache.jetspeed.cache.file.FileCache"
+ init-method="startFileScanner"
+ destroy-method="stopFileScanner">
+ <!-- Scan rate for changes in cached files on the file system -->
+ <constructor-arg index="0"><value>10</value></constructor-arg>
+ <!-- Cache size -->
+ <constructor-arg index="1"><value>100</value></constructor-arg>
+ </bean>
+
+ <!-- DocumentHandlerFactory -->
+ <bean id="PsmlDocumentHandler"
+ class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>.psml</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Page</value></constructor-arg>
+ <constructor-arg index="3" ><value>target/testdata/pages</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="LinkDocumentHandler"
+ class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>.link</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Link</value></constructor-arg>
+ <constructor-arg index="3" ><value>target/testdata/pages</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="FolderMetaDataDocumentHandler"
+ class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.FolderMetaData</value></constructor-arg>
+ <constructor-arg index="3" ><value>target/testdata/pages</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="PageSecurityDocumentHandler"
+ class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>page.security</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.PageSecurity</value></constructor-arg>
+ <constructor-arg index="3" ><value>target/testdata/pages</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="DocumentHandlerFactory"
+ class="org.apache.jetspeed.page.document.DocumentHandlerFactoryImpl" >
+ <constructor-arg>
+ <map>
+ <entry key=".psml">
+ <ref bean="PsmlDocumentHandler" />
+ </entry>
+ <entry key=".link">
+ <ref bean="LinkDocumentHandler" />
+ </entry>
+ <entry key="folder.metadata">
+ <ref bean="FolderMetaDataDocumentHandler" />
+ </entry>
+ <entry key="page.security">
+ <ref bean="PageSecurityDocumentHandler" />
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <!-- FolderHandler -->
+ <bean id="FolderHandler"
+ class="org.apache.jetspeed.page.document.FileSystemFolderHandler" >
+ <constructor-arg index="0"><value>target/testdata/pages</value></constructor-arg>
+ <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+ <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <!-- PageManager -->
+ <bean id="org.apache.jetspeed.page.PageManager"
+ name="pageManager"
+ class="org.apache.jetspeed.page.impl.CastorXmlPageManager">
+ <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+ <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+ <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
+ <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>
+ <!-- permissions security enabled flag, default=false -->
+ <constructor-arg index="4"><value>false</value></constructor-arg>
+ <!-- constraints security enabled flag, default=true -->
+ <constructor-arg index="5"><value>false</value></constructor-arg>
+ </bean>
+
+ <!-- PortalSite -->
+ <bean id="org.apache.jetspeed.portalsite.PortalSite"
+ name="portalSite"
+ class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">
+ <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
+ </bean>
+
+</beans>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java Mon Aug 29 05:04:38 2005
@@ -722,7 +722,7 @@
assertNotNull(breadcrumbsMenu);
assertFalse(breadcrumbsMenu.isEmpty());
assertEquals("You are here:", breadcrumbsMenu.getTitle());
- assertEquals("\u00bb", breadcrumbsMenu.getTitle(Locale.JAPANESE));
+ assertEquals("\u73fe\u5728\u30d1\u30b9\uff1a", breadcrumbsMenu.getTitle(Locale.JAPANESE));
Menu navigationsMenu = requestContext.getMenu("navigations");
assertNotNull(navigationsMenu);
assertFalse(navigationsMenu.isEmpty());
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/maven.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/maven.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/maven.xml Mon Aug 29 05:04:38 2005
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven">
-
- <!-- Target of maven test:single test -->
- <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager' />
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven">
+
+ <!-- Target of maven test:single test -->
+ <property name='testcase' value='org.apache.jetspeed.components.TestComponentManager' />
+
+</project>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.properties?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.properties (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.properties Mon Aug 29 05:04:38 2005
@@ -1,20 +1,20 @@
-# Copyright 2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# $Id: project.properties 187000 2004-07-11 03:32:22Z paulsp $
-#
-
-maven.multiproject.type=jar
-maven.license.licenseFile=${basedir}/../../LICENSE.TXT
-
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Id: project.properties 187000 2004-07-11 03:32:22Z paulsp $
+#
+
+maven.multiproject.type=jar
+maven.license.licenseFile=${basedir}/../../LICENSE.TXT
+
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.xml Mon Aug 29 05:04:38 2005
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright 2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
--->
-<project>
- <extend>${basedir}/../../jetspeed-components.xml</extend>
- <id>jetspeed-portal</id>
- <name>Jetspeed-2 Portal Components</name>
- <package>org.apache.jetspeed</package>
- <description>Portal Components</description>
- <shortDescription>Portal Components</shortDescription>
- <repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portal/</url>
- </repository>
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/Test*</include>
- </includes>
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- <exclude>repository_database.xml</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/../../etc/log4j</directory>
- </resource>
- <resource>
- <directory>${basedir}/../../etc/db-ojb</directory>
- </resource>
- <resource>
- <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
- </resource>
- </resources>
-
- </unitTest>
-
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
-
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
+-->
+<project>
+ <extend>${basedir}/../../jetspeed-components.xml</extend>
+ <id>jetspeed-portal</id>
+ <name>Jetspeed-2 Portal Components</name>
+ <package>org.apache.jetspeed</package>
+ <description>Portal Components</description>
+ <shortDescription>Portal Components</shortDescription>
+ <repository>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/portal</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/portal/</url>
+ </repository>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>repository_database.xml</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/log4j</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../etc/db-ojb</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/../../src/webapp/WEB-INF/assembly</directory>
+ </resource>
+ </resources>
+
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ </build>
+
+</project>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java Mon Aug 29 05:04:38 2005
@@ -175,7 +175,7 @@
String portletApplicationName = webApplicationDefinition.getContextRoot();
// gather all required data from request and response
- ServletRequest servletRequest = ((HttpServletRequestWrapper)((HttpServletRequestWrapper)portletRequest).getRequest()).getRequest();
+ ServletRequest servletRequest = ((HttpServletRequestWrapper)((HttpServletRequestWrapper)((HttpServletRequestWrapper)portletRequest).getRequest()).getRequest()).getRequest();
ServletResponse servletResponse = ((HttpServletResponseWrapper) portletResponse).getResponse();
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java Mon Aug 29 05:04:38 2005
@@ -15,12 +15,9 @@
*/
package org.apache.jetspeed.request;
-import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.WeakHashMap;
@@ -28,6 +25,7 @@
import javax.security.auth.Subject;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import org.apache.jetspeed.Jetspeed;
@@ -41,7 +39,6 @@
import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.jetspeed.om.impl.LanguageImpl;
import org.apache.jetspeed.om.page.ContentPage;
-import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.userinfo.UserInfoManager;
import org.apache.pluto.om.common.Language;
import org.apache.pluto.om.common.LanguageSet;
@@ -83,9 +80,6 @@
private Map requestsForWindows;
private Map responsesForWindows;
- private Fragment rootFragment;
- private Map fragments;
-
/**
* Create a new Request Context
*
@@ -103,15 +97,34 @@
this.userInfoMgr = userInfoMgr;
this.requestsForWindows = new HashMap();
this.responsesForWindows = new HashMap();
- this.fragments = new LinkedHashMap();
// set context in Request for later use
if (null != this.request)
{
this.request.setAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE, this);
+ PortalRequestFactory prf = null;
+ try
+ {
+ prf = (PortalRequestFactory)Jetspeed.getComponentManager().getComponent(PortalRequestFactory.class);
+ }
+ catch (Throwable t)
+ {
+ // allow undefined
+ }
+ if ( prf != null )
+ {
+ this.request = prf.createPortalRequest(this.request);
+ }
+ else
+ {
+ // Simply wrap the current request so we maintain the same
+ // level of wrapping.
+ // This is needed in the ServletPortletInvoker to get back
+ // to the original request.
+ this.request = new HttpServletRequestWrapper(this.request);
+ }
}
}
-
public HttpServletRequest getRequest()
{
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java Mon Aug 29 05:04:38 2005
@@ -85,7 +85,8 @@
if ( request.getSessionAttribute(CHECKED_KEY) == null )
{
request.setSessionAttribute(CHECKED_KEY,Boolean.TRUE);
- if ( pwdCredential.getPreviousAuthenticationDate() != null )
+ if ( pwdCredential.getPreviousAuthenticationDate() != null &&
+ pwdCredential.getExpirationDate() != null )
{
long expirationTime = pwdCredential.getExpirationDate().getTime();
long lastAuthTime = pwdCredential.getLastAuthenticationDate().getTime();
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java Mon Aug 29 05:04:38 2005
@@ -28,6 +28,7 @@
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.Page;
import org.apache.pluto.om.entity.PortletEntity;
+import org.apache.velocity.context.Context;
/**
* JetspeedPowerTool
@@ -230,4 +231,12 @@
String getBasePath();
String getPageBasePath();
+
+ /**
+ * Sets the Velocity Context object for this powertool instance. This is
+ * only required if using Velocity based decortaions and layouts.
+ *
+ * @param velocityContext
+ */
+ void setVelocityContext(Context velocityContext);
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java Mon Aug 29 05:04:38 2005
@@ -60,6 +60,7 @@
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.services.title.DynamicTitleService;
import org.apache.jetspeed.util.ArgUtil;
+import org.apache.jetspeed.util.Path;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.ContentTypeSet;
import org.apache.pluto.om.window.PortletWindow;
@@ -88,6 +89,8 @@
public class JetspeedPowerToolImpl implements JetspeedPowerTool
{
+ private static final String DECORATOR_ID_ATTR = "decoratorId";
+ private static final String ACTION_IMAGE_EXTENSION_ATTR = "actionImageExtension";
protected static final String PORTLET_CONFIG_ATTR = "javax.portlet.config";
protected static final String RENDER_RESPONSE_ATTR = "javax.portlet.response";
protected static final String RENDER_REQUEST_ATTR = "javax.portlet.request";
@@ -219,7 +222,7 @@
public void setCurrentFragment( ContentFragment f )
{
checkState();
- renderRequest.setAttribute(PortalReservedParameters.FRAGMENT_ATTRIBUTE, f);
+ setAttribute(PortalReservedParameters.FRAGMENT_ATTRIBUTE, f);
}
@@ -228,7 +231,7 @@
checkState();
ContentFragment f = (ContentFragment) getRequestContext().getRequest().getAttribute(LAYOUT_ATTR);
- renderRequest.setAttribute(LAYOUT_ATTR, f);
+ setAttribute(LAYOUT_ATTR, f);
}
/**
@@ -541,7 +544,9 @@
template = getDecoration(parent + "/" + DECORATOR_TYPE + ext, fragmentType);
}
}
-
+
+ setAttribute(DECORATOR_ID_ATTR, decoConf.getString("id"));
+ setAttribute(ACTION_IMAGE_EXTENSION_ATTR, decoConf.getString("action.image.extension", ".gif"));
return template.getAppRelativePath();
}
@@ -580,6 +585,15 @@
descriptor.setType(templateType);
TemplateDescriptor template = locator.locateTemplate(descriptor);
+ // Check for defaults above the currently specified root
+ if(template == null)
+ {
+ Path pathObject = new Path(path);
+ if(pathObject.length() > 1)
+ {
+ template = getTemplate(pathObject.getSegment(1).toString(), templateType, locator, descriptor);
+ }
+ }
return template;
}
catch (TemplateLocatorException e)
@@ -606,7 +620,7 @@
if (exceptions == null)
{
exceptions = new HashSet();
- renderRequest.setAttribute(FRAGMENT_PROCESSING_ERROR_PREFIX + fragment.getId(), exceptions);
+ setAttribute(FRAGMENT_PROCESSING_ERROR_PREFIX + fragment.getId(), exceptions);
}
exceptions.add(e);
@@ -781,7 +795,11 @@
protected DecoratorAction createDecoratorAction( String resourceBase, String actionName )
{
- // TODO: HARD-CODED .gif link
+ String imageExt = (String) renderRequest.getAttribute(ACTION_IMAGE_EXTENSION_ATTR);
+ if(imageExt == null)
+ {
+ imageExt = ".gif";
+ }
String link = renderResponse.encodeURL(resourceBase+"/content/images/"+actionName+".gif");
return new DecoratorAction(actionName, actionName, link);
}
@@ -903,5 +921,29 @@
{
return getRequestContext().getPortalURL().getPageBasePath();
}
+
+
+ public void setVelocityContext(Context velocityContext)
+ {
+ this.velocityContext = velocityContext;
+ }
+
+ /**
+ * Sets an attribute for use within your layout and decoration templates. The value is always stored
+ * within the current <code>javax.portlet.Renderrequest</code> and is also stored within the current
+ * <code>org.apache.velocity.Context</code> if it is available.
+ *
+ * @param name to store the attribute under.
+ * @param obj object to set.
+ */
+ protected void setAttribute(String name, Object object)
+ {
+ renderRequest.setAttribute(name, object);
+ if(velocityContext != null)
+ {
+ velocityContext.put(name, object);
+ }
+ }
+
}
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java Mon Aug 29 05:04:38 2005
@@ -183,6 +183,7 @@
"the HttpServletRequest.");
}
+ jpt.setVelocityContext(ctx);
ctx.put("jetspeed", jpt);
ctx.put("JS2RequestContext", requestContext);
ctx.put("renderRequest", renderRequest);
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/JETSPEED-INF/spring/user-info.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/JETSPEED-INF/spring/user-info.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/JETSPEED-INF/spring/user-info.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/JETSPEED-INF/spring/user-info.xml Mon Aug 29 05:04:38 2005
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<beans>
- <!-- User Info -->
- <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
- class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
- >
- <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
- <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
-
- </bean>
-
- <bean id="org.apache.jetspeed.userinfo.MultiUserInfoManager"
- class="org.apache.jetspeed.userinfo.impl.MultiSourceUserInfoManagerImpl">
- <property name="portletRegistry">
- <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>
- </property>
- <property name="sources">
- <list>
- <ref bean="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"/>
- </list>
- </property>
- </bean>
-
- <bean id="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"
- class="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl">
- <property name="userManager">
- <ref bean="org.apache.jetspeed.security.UserManager"/>
- </property>
- </bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+ <!-- User Info -->
+ <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
+ class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
+ >
+ <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
+ <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
+
+ </bean>
+
+ <bean id="org.apache.jetspeed.userinfo.MultiUserInfoManager"
+ class="org.apache.jetspeed.userinfo.impl.MultiSourceUserInfoManagerImpl">
+ <property name="portletRegistry">
+ <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>
+ </property>
+ <property name="sources">
+ <list>
+ <ref bean="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl"
+ class="org.apache.jetspeed.userinfo.impl.UserManagerUserAttributeSourceImpl">
+ <property name="userManager">
+ <ref bean="org.apache.jetspeed.security.UserManager"/>
+ </property>
+ </bean>
+
</beans>
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/JETSPEED-INF/spring/user-info.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/org/apache/jetspeed/testhelpers/SpringEngineHelper.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/org/apache/jetspeed/testhelpers/SpringEngineHelper.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/org/apache/jetspeed/testhelpers/SpringEngineHelper.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/org/apache/jetspeed/testhelpers/SpringEngineHelper.java Mon Aug 29 05:04:38 2005
@@ -46,7 +46,7 @@
ServletConfigFactoryBean.setServletConfig(servletConfig);
ApplicationContext bootCtx = (ApplicationContext) context.get(AbstractTestHelper.APP_CONTEXT);
- SpringComponentManager scm = new SpringComponentManager(null, new String[] {"/WEB-INF/assembly/*.xml"}, servletContent, appRoot );
+ SpringComponentManager scm = new SpringComponentManager(new String[] {"../../etc/db-ojb/test-*.xml"}, new String[] {"/WEB-INF/assembly/*.xml"}, servletContent, appRoot );
engine = new JetspeedEngine(config, appRoot, servletConfig, scm );
engine.start();
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java Mon Aug 29 05:04:38 2005
@@ -105,9 +105,7 @@
private void innerTestSetUserInfoMap(UserInfoManager uim) throws Exception
{
- PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader(
- buildProperties.getUserProperty("org.apache.jetspeed.project.home")
- + "/components/portal/test/testdata/deploy/portlet.xml"), "unit-test");
+ PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("test/testdata/deploy/portlet.xml"), "unit-test");
portletApp = pad.createPortletApplication();
assertNotNull("App is null", portletApp);
@@ -141,12 +139,9 @@
assertNull("should not contain user.home-info.online.email", userInfo.get("user.home-info.online.email"));
// With linked attributes
- ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader(
- buildProperties.getUserProperty("org.apache.jetspeed.project.home")
- + "/components/portal/test/testdata/deploy/jetspeed-portlet.xml"),
- portletApp);
+ ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader("test/testdata/deploy/jetspeed-portlet.xml"), portletApp);
extMetaData.load();
-
+
// persist the app
try
{
@@ -257,15 +252,18 @@
private void cleanUp() throws Exception
{
// remove the app
- try
- {
- portletRegistry.removeApplication(portletApp);
- }
- catch (Exception e)
+ if (null != portletApp)
{
- String msg = "Unable to remove portlet application, " + portletApp.getName()
- + ", through the portlet portletRegistry: " + e.toString();
- throw new Exception(msg, e);
+ try
+ {
+ portletRegistry.removeApplication(portletApp);
+ }
+ catch (Exception e)
+ {
+ String msg = "Unable to remove portlet application, " + portletApp.getName()
+ + ", through the portlet portletRegistry: " + e.toString();
+ throw new Exception(msg, e);
+ }
}
destroyUser();
Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml Mon Aug 29 05:04:38 2005
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<portlet-app id="TestSecurityRoles" version="1.0">
- <portlet id="TestPortlet">
- <portlet-name>TestPortlet</portlet-name>
- <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
- <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
- <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
- <expiration-cache>-1</expiration-cache>
- <supports id="Minimal support">
- <mime-type>text/html</mime-type>
- <portlet-mode>EDIT</portlet-mode>
- <portlet-mode>VIEW</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
- </supports>
- <portlet-info>
- <title>HelloWorldTitle</title>
- <short-title>This is the short title</short-title>
- <keywords>Test,David</keywords>
- </portlet-info>
- <portlet-preferences>
- <preference>
- <name>time-server</name>
- <value>http://timeserver.myco.com</value>
- <value>http://timeserver.foo.com</value>
- <read-only>false</read-only>
- </preference>
- <preference>
- <name>port</name>
- <value>404</value>
- <read-only>true</read-only>
- </preference>
- </portlet-preferences>
-
- </portlet>
-
- </portlet-app>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<portlet-app id="TestSecurityRoles" version="1.0">
+ <portlet id="TestPortlet">
+ <portlet-name>TestPortlet</portlet-name>
+ <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
+ <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
+ <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
+ <expiration-cache>-1</expiration-cache>
+ <supports id="Minimal support">
+ <mime-type>text/html</mime-type>
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>HelloWorldTitle</title>
+ <short-title>This is the short title</short-title>
+ <keywords>Test,David</keywords>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>time-server</name>
+ <value>http://timeserver.myco.com</value>
+ <value>http://timeserver.foo.com</value>
+ <read-only>false</read-only>
+ </preference>
+ <preference>
+ <name>port</name>
+ <value>404</value>
+ <read-only>true</read-only>
+ </preference>
+ </portlet-preferences>
+
+ </portlet>
+
+ </portlet-app>
+
+
Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/portlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org