You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cz...@apache.org on 2007/03/09 09:55:35 UTC
svn commit: r516335 [2/2] - in /portals/pluto/trunk:
maven-pluto-plugin/src/main/java/org/apache/pluto/maven/
pluto-ant-tasks/src/main/java/org/apache/pluto/ant/
pluto-container/src/main/java/org/apache/pluto/
pluto-container/src/main/java/org/apache/p...
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java Fri Mar 9 00:55:30 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -36,31 +36,29 @@
* Abstract <code>javax.portlet.PortletResponse</code> implementation.
* This class also implements InternalPortletResponse.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public abstract class PortletResponseImpl extends HttpServletResponseWrapper
implements PortletResponse, InternalPortletResponse {
-
+
// Private Member Variables ------------------------------------------------
-
+
/** The portlet container. */
- private PortletContainer container = null;
-
+ private PortletContainer container;
+
/** The internal portlet window. */
- private InternalPortletWindow internalPortletWindow = null;
+ private InternalPortletWindow internalPortletWindow;
/** The servlet request of the target/portlet's web module. */
- private HttpServletRequest httpServletRequest = null;
-
+ private HttpServletRequest httpServletRequest;
+
private boolean usingWriter;
private boolean usingStream;
private ServletOutputStream wrappedWriter;
-
-
+
+
// Constructor -------------------------------------------------------------
-
+
public PortletResponseImpl(PortletContainer container,
InternalPortletWindow internalPortletWindow,
HttpServletRequest servletRequest,
@@ -70,10 +68,10 @@
this.httpServletRequest = servletRequest;
this.internalPortletWindow = internalPortletWindow;
}
-
-
+
+
// PortletResponse Impl ----------------------------------------------------
-
+
public void addProperty(String name, String value) {
ArgumentUtility.validateNotNull("propertyName", name);
container.getRequiredContainerServices()
@@ -99,7 +97,7 @@
throw new IllegalArgumentException(
"only absolute URLs or full path URIs are allowed");
}
-
+
ResourceURLProvider provider = getContainer()
.getRequiredContainerServices()
.getPortalCallbackService()
@@ -113,17 +111,17 @@
}
return getHttpServletResponse().encodeURL(provider.toString());
}
-
-
+
+
// InternalPortletResponse impl --------------------------------------------
-
+
public InternalPortletWindow getInternalPortletWindow() {
return internalPortletWindow;
}
-
-
+
+
// Internal Methods --------------------------------------------------------
-
+
/**
* Returns the portlet container.
* @return the portlet container.
@@ -131,7 +129,7 @@
protected PortletContainer getContainer() {
return container;
}
-
+
/**
* Returns the nested HttpServletRequest instance.
* @return the nested HttpServletRequest instance.
@@ -139,7 +137,7 @@
protected HttpServletRequest getHttpServletRequest() {
return httpServletRequest;
}
-
+
/**
* Returns the nested HttpServletResponse instance.
* @return the nested HttpServletResponse instance.
@@ -147,14 +145,14 @@
public HttpServletResponse getHttpServletResponse() {
return (HttpServletResponse) super.getResponse();
}
-
-
+
+
// HttpServletResponse Methods ---------------------------------------------
-
+
public String encodeUrl(String url) {
return this.encodeURL(url);
}
-
+
/**
* TODO: javadoc about why we are using a wrapped writer here.
* @see org.apache.pluto.util.PrintWriterServletOutputStream
@@ -173,7 +171,7 @@
usingStream = true;
return wrappedWriter;
}
-
+
public PrintWriter getWriter()
throws IllegalStateException, IOException {
if (usingStream) {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java Fri Mar 9 00:55:30 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -33,39 +33,37 @@
/**
* Implementation of the <code>javax.portlet.PortletSession</code> interface.
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
*/
public class PortletSessionImpl implements PortletSession, HttpSession {
-
+
/** Logger. */
private static final Log LOG = LogFactory.getLog(PortletSessionImpl.class);
-
+
/** The default scope (<code>PORTLET_SCOPE</code>) for storing objects. */
private static final int DEFAULT_SCOPE = PortletSession.PORTLET_SCOPE;
-
+
/** The portlet scope namespace as defined in PLT. 15.3. */
private static final String PORTLET_SCOPE_NAMESPACE = "javax.portlet.p.";
-
+
/** The portlet window ID / attribute name separator as defined in PLT. 15.3. */
private static final char ID_NAME_SEPARATOR = '?';
-
+
// Private Member Variables ------------------------------------------------
-
+
/** The wrapped HttpSession object. */
- private HttpSession httpSession = null;
-
+ private HttpSession httpSession;
+
/** The portlet context. */
- private PortletContext portletContext = null;
-
+ private PortletContext portletContext;
+
/** The internal portlet window. */
- private InternalPortletWindow internalPortletWindow = null;
-
-
+ private InternalPortletWindow internalPortletWindow;
+
+
// Constructor -------------------------------------------------------------
-
+
/**
* Constructs an instance.
*/
@@ -76,17 +74,17 @@
this.internalPortletWindow = internalPortletWindow;
this.httpSession = httpSession;
}
-
-
+
+
// PortletSession Impl: Attributes -----------------------------------------
-
+
public Object getAttribute(String name) {
return getAttribute(name, DEFAULT_SCOPE);
}
-
+
/**
* Returns the attribute of the specified name under the given scope.
- *
+ *
* @param name the attribute name.
* @param scope the scope under which the attribute object is stored.
* @return the attribute object.
@@ -97,11 +95,11 @@
? name : createPortletScopedId(name);
return httpSession.getAttribute(key);
}
-
+
public Enumeration getAttributeNames() {
return getAttributeNames(DEFAULT_SCOPE);
}
-
+
public Enumeration getAttributeNames(int scope) {
// Return all attribute names in the nested HttpSession object.
if (scope == PortletSession.APPLICATION_SCOPE) {
@@ -121,7 +119,7 @@
return portletScopedNames.elements();
}
}
-
+
public void removeAttribute(String name) {
removeAttribute(name, DEFAULT_SCOPE);
}
@@ -134,7 +132,7 @@
httpSession.removeAttribute(createPortletScopedId(name));
}
}
-
+
public void setAttribute(String name, Object value) {
setAttribute(name, value, DEFAULT_SCOPE);
}
@@ -148,9 +146,9 @@
}
}
-
+
// PortletSession Impl: Other Methods --------------------------------------
-
+
public PortletContext getPortletContext() {
return portletContext;
}
@@ -178,7 +176,7 @@
public boolean isNew() throws IllegalStateException {
return httpSession.isNew();
}
-
+
/**
* Specifies the time, in seconds, between client requests, before the
* portlet container invalidates this session. A negative time indicates
@@ -189,17 +187,17 @@
* HttpSession object.
* </p>
* @param interval an integer specifying the number of seconds.
- */
+ */
public void setMaxInactiveInterval(int interval) {
httpSession.setMaxInactiveInterval(interval);
if (LOG.isDebugEnabled()) {
LOG.debug("Session timeout set to: " + interval);
}
}
-
-
+
+
// Private Methods ---------------------------------------------------------
-
+
/**
* Creates portlet-scoped ID for the specified attribute name.
* Portlet-scoped ID for a given attribute name has the following form:
@@ -221,10 +219,10 @@
buffer.append(name);
return buffer.toString();
}
-
+
/**
* Checks if the attribute name in APPLICATION_SCOPE is in the current
- * portlet scope.
+ * portlet scope.
* @param name the attribute name to check.
* @return true if the attribute name is in the current portlet scope.
* @see #createPortletScopedId(String)
@@ -243,10 +241,10 @@
return false;
}
}
-
-
+
+
// HttpSession Impl --------------------------------------------------------
-
+
public ServletContext getServletContext() {
return httpSession.getServletContext();
}
@@ -278,5 +276,5 @@
public void removeValue(String name) {
this.removeAttribute(name, DEFAULT_SCOPE);
}
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RandomStringUtils.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RandomStringUtils.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RandomStringUtils.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RandomStringUtils.java Fri Mar 9 00:55:30 2007
@@ -19,15 +19,9 @@
import java.util.Random;
/**
* <strong>Copied from commons-lang. No need for dependency.</strong>
- *
+ *
* <p>Operations for random <code>String</code>s.</p>
*
- * @author GenerationJava Core library
- * @author <a href="mailto:bayard@generationjava.com">Henri Yandell</a>
- * @author <a href="mailto:steven@caswell.name">Steven Caswell</a>
- * @author Stephen Colebourne
- * @author Gary Gregory
- * @author Phil Steitz
* @since 1.0
* @version $Id$
*/
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java Fri Mar 9 00:55:30 2007
@@ -42,8 +42,6 @@
/**
* Implementation of the <code>javax.portlet.RenderRequest</code> interface.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class RenderRequestImpl extends PortletRequestImpl
implements RenderRequest, InternalRenderRequest {
@@ -58,10 +56,10 @@
private boolean included = false;
/** The parameters including parameters appended to the dispatching URI. */
- private Map parameters = null;
+ private Map parameters;
/** The portlet preferences. */
- private PortletPreferences portletPreferences = null;
+ private PortletPreferences portletPreferences;
// Constructors ------------------------------------------------------------
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java Fri Mar 9 00:55:30 2007
@@ -7,7 +7,7 @@
* 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.
@@ -44,8 +44,6 @@
/**
* Implementation of the <code>javax.portlet.RenderResponse</code> interface.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class RenderResponseImpl extends PortletResponseImpl
implements RenderResponse, InternalRenderResponse {
@@ -68,7 +66,7 @@
/**
* The current content type.
*/
- private String currentContentType = null;
+ private String currentContentType;
private NamespaceMapper mapper = new NamespaceMapperImpl();
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java Fri Mar 9 00:55:30 2007
@@ -16,28 +16,31 @@
*/
package org.apache.pluto.internal.impl;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.PortletWindow;
+import org.apache.pluto.core.ContainerInvocation;
import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.portlet.PortletInfoDD;
-import org.apache.pluto.util.StringManager;
import org.apache.pluto.spi.optional.PortletInfoService;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.core.ContainerInvocation;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
-
-import java.util.*;
+import org.apache.pluto.util.StringManager;
/**
* Factory object used to create Portlet Resource Bundles.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
*
*/
class ResourceBundleFactory {
-
- private static final Log LOG =
+
+ private static final Log LOG =
LogFactory.getLog(ResourceBundleFactory.class);
-
+
private static final StringManager EXCEPTIONS =
StringManager.getManager(ResourceBundleFactory.class.getPackage().getName());
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ContainerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ContainerService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ContainerService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ContainerService.java Fri Mar 9 00:55:30 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -18,8 +18,6 @@
/**
* Defines a service and needs to be implemented by all PortletContainerServices.
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public interface ContainerService {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java Fri Mar 9 00:55:30 2007
@@ -25,8 +25,6 @@
/**
* The callback service interface defining callback methods that will be invoked
* by the portlet container when necessary.
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.0
* @since Sep 21, 2004
*/
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java Fri Mar 9 00:55:30 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -25,9 +25,7 @@
* Defines the interface used by the portlet container to create Portal URLs.
* This provider must be implemented by the Portal and provided via the
* container services upon initialization of the container.
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
* @version 1.0
*/
public interface PortletURLProvider {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java Fri Mar 9 00:55:30 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -18,12 +18,10 @@
/**
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.0
*/
public interface ResourceURLProvider {
-
+
/**
* Sets the absolute URL to be returned by the provider. E.g.
* http://host/wps/portal/hello.gif
@@ -44,5 +42,5 @@
* @return the URL as string
*/
public String toString();
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.java Fri Mar 9 00:55:30 2007
@@ -17,20 +17,19 @@
package org.apache.pluto.spi.optional;
/**
- * As defined in PLT.D of the JSR-168 specification, this class defines a set of
- * attribute names for user information and their intended
- * meaning. To allow portals an automated mapping of commonly used user information
- * attributes portlet programmers should use these attribute names. These attribute names
- * are derived from the Platform for Privacy Preferences 1.0 (P3P 1.0) Specification by the
- * W3C (http://www.w3c.org/TR/P3P).
- *
- * @author <a href="cdoremus@apache.org">Craig Doremus</a>
+ * As defined in PLT.D of the JSR-168 specification, this class defines a set of
+ * attribute names for user information and their intended
+ * meaning. To allow portals an automated mapping of commonly used user information
+ * attributes portlet programmers should use these attribute names. These attribute names
+ * are derived from the Platform for Privacy Preferences 1.0 (P3P 1.0) Specification by the
+ * W3C (http://www.w3c.org/TR/P3P).
+ *
*/
public interface P3PAttributes {
- /* NOTE: The user.bdate must consist of a string that represents the time in milliseconds
+ /* NOTE: The user.bdate must consist of a string that represents the time in milliseconds
since January 1, 1970, 00:00:00 GMT. */
- public static final String USER_BDATE = "user.bdate";
+ public static final String USER_BDATE = "user.bdate";
public static final String USER_GENDER = "user.gender";
public static final String USER_EMPLOYER = "user.employer";
public static final String USER_DEPARTMENT = "user.department";
@@ -99,7 +98,7 @@
public static final String USER_BUSINESS_INFO_TELECOM_PAGER_COMMENT = "user.business-info.telecom.pager.comment";
public static final String USER_BUSINESS_INFO_ONLINE_EMAIL = "user.business-info.online.email";
public static final String USER_BUSINESS_INFO_ONLINE_URI = "user.business-info.online.uri";
-
+
public static final String[] ATTRIBUTE_ARRAY = {
"user.bdate",
"user.gender",
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java Fri Mar 9 00:55:30 2007
@@ -29,7 +29,6 @@
/**
* Factory Service for creating Portlet request and responses.
*
- * @author David H. DeWolf
* @since 1.1.0
*/
public interface PortletEnvironmentService {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInfoService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInfoService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInfoService.java Fri Mar 9 00:55:30 2007
@@ -24,7 +24,6 @@
* portlet administration tool enables customization
* during deployment.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @since 1.1.0
*
*/
@@ -56,5 +55,5 @@
* @return
*/
String getKeywords(PortletWindow window);
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java Fri Mar 9 00:55:30 2007
@@ -29,10 +29,9 @@
/**
* Service used to invoke portlets.
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public interface PortletInvokerService {
-
+
public void action(ActionRequest req, ActionResponse res, InternalPortletWindow window)
throws IOException, PortletException;
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java Fri Mar 9 00:55:30 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -26,11 +26,10 @@
/**
* Portlet preferences service that should be implemented by the portal.
* This is an optional container service.
- *
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
*/
public interface PortletPreferencesService extends ContainerService {
-
+
/**
* Returns the stored portlet preferences.
* @param portletWindow the portlet window.
@@ -42,7 +41,7 @@
PortletWindow portletWindow,
PortletRequest request)
throws PortletContainerException;
-
+
/**
* Stores the portlet references to the persistent storage.
* @param portletWindow the portlet window.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
* Encapsulation of event information.
*
* @since 1.1.0
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
*/
public class PortletRegistryEvent {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryListener.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryListener.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryListener.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryListener.java Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
* of new portlet application registrations.
*
* @since 1.1.0
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
*/
public interface PortletRegistryListener {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java Fri Mar 9 00:55:30 2007
@@ -31,8 +31,7 @@
* as a mechanism for notifying the container of new applications.
*
* @since 1.1.0
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- *
+ *
*/
public interface PortletRegistryService {
@@ -73,7 +72,7 @@
/**
* Retrieve the PortletContext for the specified applicationId
- *
+ *
* @param applicationId context identifier
* @return portlet context
* @throws PortletContainerException if internal error occurs
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
* PLT.17.2 of the JSR-168 specificiation. Attribute persistence is
* not covered by the spec so it is not done here.
*
- * @author <a href="cdoremus@apache.org">Craig Doremus</a>
* @deprecated use UserInfoService
* @see UserInfoService
*/
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java Fri Mar 9 00:55:30 2007
@@ -28,8 +28,6 @@
* PLT.17.2 of the JSR-168 specificiation. Attribute persistence is
* not covered by the spec so it is not done here.
*
- * @author <a href="cdoremus@apache.org">Craig Doremus</a>
- * @author <a href="ddewolf@apache.org">David DeWolf</a>
*/
public interface UserInfoService extends ContainerService {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java Fri Mar 9 00:55:30 2007
@@ -21,18 +21,16 @@
/**
* Static class that provides utility static methods for argument validation.
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
*/
public class ArgumentUtility {
-
+
/** Logger. */
public static final Log LOG = LogFactory.getLog(ArgumentUtility.class);
-
-
+
+
// Static Utility Methods --------------------------------------------------
-
+
/**
* Validates that the passed-in argument value is not null.
* @param argumentName the argument name.
@@ -51,7 +49,7 @@
+ " (argument should not be null)");
}
}
-
+
/**
* Validates that the passed-in string argument value is not null or empty.
* @param argumentName the argument name.
@@ -70,5 +68,5 @@
+ " (argument should not be null or empty)");
}
}
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringManager.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringManager.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringManager.java Fri Mar 9 00:55:30 2007
@@ -41,8 +41,6 @@
* <p/>
* <p>Please see the documentation for java.util.ResourceBundle for more
* information.
- * @author James Duncan Davidson [duncan@eng.sun.com]
- * @author James Todd [gonzo@eng.sun.com]
*/
public class StringManager {
@@ -53,11 +51,11 @@
*/
private ResourceBundle bundle;
-
- /**
+
+ /**
* The package this StringManager belongs to.
*/
- private String packageName = null;
+ private String packageName;
/**
* Creates a new StringManager for a given package. This is a private method
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringUtils.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringUtils.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringUtils.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringUtils.java Fri Mar 9 00:55:30 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -22,23 +22,21 @@
/**
* Static class hosting a couple of utility methods around strings.
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class StringUtils {
-
+
// Private Constructor -----------------------------------------------------
-
+
/**
* Private constructor that prevents external instantiation.
*/
private StringUtils() {
// Do nothing.
}
-
-
+
+
// Static Utility Methods --------------------------------------------------
-
+
/**
* Replaces all occurrences of a pattern within a string by a replacement.
* @param source the string that should be searched.
@@ -75,7 +73,7 @@
out.append(source.substring(i));
return out.toString();
}
-
+
/**
* TODO: can't we just use String[].clone()?
* @param source
@@ -90,7 +88,7 @@
System.arraycopy(source, 0, result, 0, length);
return result;
}
-
+
/**
* Deep-clones a parameter map. The key is the parameter name as a String
* instance, while the value is a String array (String[]) instance.
@@ -114,11 +112,11 @@
}
return result;
}
-
+
/**
* Strips the specified mime type by removing the character encoding
* specified at the end of the mime type (all characters after the ';').
- * The stripped mime type is trimmed string which contains no white
+ * The stripped mime type is trimmed string which contains no white
* spaces at the beginning and the end.
* @param mimeType the mime type to strip.
* @return the stripped mime type.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java Fri Mar 9 00:55:30 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -21,18 +21,16 @@
/**
* Default implementation of <code>NamespaceMapper</code> interface.
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class NamespaceMapperImpl implements NamespaceMapper {
-
+
public NamespaceMapperImpl() {
// Do nothing.
}
-
-
+
+
// NamespaceMapper Impl ----------------------------------------------------
-
+
public String encode(PortletWindowID portletWindowId, String name) {
StringBuffer buffer = new StringBuffer(50);
buffer.append("Pluto_");
@@ -68,5 +66,5 @@
}
return name.substring(buffer.length());
}
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/site/xdoc/embed.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/site/xdoc/embed.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/site/xdoc/embed.xml (original)
+++ portals/pluto/trunk/pluto-container/src/site/xdoc/embed.xml Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
<properties>
<title>Embedding the Pluto Container</title>
- <author email="ddewolf@apache.org">David DeWolf</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-container/src/site/xdoc/getting-started.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/site/xdoc/getting-started.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/site/xdoc/getting-started.xml (original)
+++ portals/pluto/trunk/pluto-container/src/site/xdoc/getting-started.xml Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
<properties>
<title>Getting Started</title>
- <author email="ddewolf@apache.org">David DeWolf</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java Fri Mar 9 00:55:30 2007
@@ -23,7 +23,6 @@
/**
* Test Class
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since June 1, 2005
*/
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java Fri Mar 9 00:55:30 2007
@@ -28,7 +28,6 @@
/**
* Unit test for the resource bundle factory.
- * @author ddewolf@apache.org
* @since Jul 30, 2005
*/
public class ResourceBundleFactoryTest extends PlutoTestCase {
@@ -45,7 +44,7 @@
info.setShortTitle("Info Short Title");
info.setKeywords("Info Keywords");
validDD.setPortletInfo(info);
-
+
validDD.setResourceBundle(TestResourceBundle.class.getName());
}
@@ -118,7 +117,7 @@
public static class TestResourceBundle extends ListResourceBundle {
-
+
private Object[][] contents = {
{"javax.portlet.title", "Bundle Title"},
{"javax.portlet.short-title", "Bundle Short Title"},
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/ArgumentUtilityTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/ArgumentUtilityTest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/ArgumentUtilityTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/ArgumentUtilityTest.java Fri Mar 9 00:55:30 2007
@@ -21,7 +21,6 @@
/**
* Test Class
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since June 1, 2005
*/
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java Fri Mar 9 00:55:30 2007
@@ -24,7 +24,6 @@
/**
* Test Class
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since June 1, 2005
*/
@@ -67,6 +66,6 @@
String testString) {
if (testString.indexOf(expectedSubstring) < 0) {
fail(message);
- }
+ }
}
}
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
/**
* Test Class
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since June 1, 2005
*/
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java Fri Mar 9 00:55:30 2007
@@ -23,7 +23,6 @@
/**
* Test Class
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since June 1, 2005
*/
@@ -62,10 +61,10 @@
}
private static int objectIDCounter = 1;
-
-
+
+
private class InternalPortletWindowID implements PortletWindowID {
-
+
private int id;
public InternalPortletWindowID() {
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/index.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/index.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/index.xml Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
<properties>
<title>Welcome to Pluto</title>
- <author email="ddewolf@apache.org">David DeWolf</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/news.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/news.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/news.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/news.xml Fri Mar 9 00:55:30 2007
@@ -22,9 +22,6 @@
<properties>
<title>Pluto Project News and Status</title>
- <author email="ddewolf.aT.apache.D0T.org">David H. DeWolf</author>
- <author email="cdoremus.aT.hannaford.D0T.com">Craig Doremus</author>
- <author email="zheng.aT.apache.D0T.org">ZHENG Zhong</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/powered.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/powered.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/powered.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/powered.xml Fri Mar 9 00:55:30 2007
@@ -19,7 +19,6 @@
-->
<document>
<properties>
- <author email="ddewolf.AT.apache.D0T.org">David H. DeWolf</author>
<title>Pluto Project | Declaration of Intent</title>
</properties>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/arch.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/arch.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/arch.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/arch.xml Fri Mar 9 00:55:30 2007
@@ -19,8 +19,6 @@
-->
<document>
<properties>
- <author email="unknown">Jean-Baptiste Joret</author>
- <author email="david.AT.daviddewolf.DOT.com">David H. DeWolf</author>
<title>Pluto Project</title>
</properties>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/build_source.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/build_source.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/build_source.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/build_source.xml Fri Mar 9 00:55:30 2007
@@ -19,9 +19,6 @@
-->
<document>
<properties>
- <author email="unknown">Jean-Baptiste Joret</author>
- <author email="david.AT.daviddewolf.DOT.com">David H. DeWolf</author>
- <author email="nl.AT.essential.DOT.com.DOT.au">Nick Lothian</author>
<title>Pluto Project</title>
</properties>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/index.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/index.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/index.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/index.xml Fri Mar 9 00:55:30 2007
@@ -19,7 +19,6 @@
-->
<document>
<properties>
- <author email="ddewolf@apache.org">David DeWolf</author>
<title>User Guide: Developing with Pluto</title>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/integrate.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/integrate.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/integrate.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/integrate.xml Fri Mar 9 00:55:30 2007
@@ -21,19 +21,11 @@
<document>
<properties>
- <author email="sthepper@apache.org">Stefan Hepper</author>
- <author email="shesmer@apache.org">Stephan Hesmer</author>
<title>Integrating Pluto Into Your Container</title>
</properties>
<body>
<section name="Integrating Pluto Into Your Container">
-
- <div align="center">
- Stefan Hepper (sthepper@apache.org)<br/>
- Stephan Hesmer (shesmer@apache.org)<br/>
- </div>
-
<subsection name="1 Introduction">
<p>
<a href="http://portals.apache.org/pluto/">Pluto</a> is a project at
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/subversion.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/subversion.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/subversion.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/subversion.xml Fri Mar 9 00:55:30 2007
@@ -19,7 +19,6 @@
-->
<document>
<properties>
- <author email="ddewolf@apache.org">David DeWolf</author>
<title>Developer Guide: Obtaining the Source Code</title>
</properties>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/install.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/install.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/install.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/install.xml Fri Mar 9 00:55:30 2007
@@ -21,11 +21,6 @@
<document>
<properties>
- <author email="unknown">Jean-Baptiste Joret</author>
- <author email="ddewolf.AT.apache.DOT.org">David H. DeWolf</author>
- <author email="nl.AT.essential.DOT.com.DOT.au">Nick Lothian</author>
- <author email="cdoremus.AT.apache.DOT.org">Craig Doremus</author>
- <author email="zheng.AT.apache.DOT.org">ZHENG Zhong</author>
<title>Getting Started with Pluto 1.0.1</title>
</properties>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/resources.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/resources.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/resources.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/resources.xml Fri Mar 9 00:55:30 2007
@@ -20,8 +20,6 @@
<document>
<properties>
- <author email="unknown">Jean-Baptiste Joret</author>
- <author email="david.AT.daviddewolf.DOT.com">David H. DeWolf</author>
<title>Pluto Project</title>
</properties>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/index.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/index.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/index.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/index.xml Fri Mar 9 00:55:30 2007
@@ -19,7 +19,6 @@
-->
<document>
<properties>
- <author email="ddewolf.AT.apache.D0T.org">David DeWolf</author>
<title>Pluto User Guide</title>
</properties>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/portal.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/portal.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/portal.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/portal.xml Fri Mar 9 00:55:30 2007
@@ -19,10 +19,6 @@
-->
<document>
<properties>
- <author email="nlothian.AT.apache.DOT.org">Nick Lothian</author>
- <author email="ddewolf.AT.apache.DOT.org">David DeWolf</author>
- <author email="cdoremus.AT.apache.DOT.org">Craig Doremus</author>
- <author email="zheng.AT.apache.DOT.org">ZHENG Zhong</author>
<title>User Guide: Pluto Portal Driver</title>
</properties>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/testsuite.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/testsuite.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/testsuite.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/testsuite.xml Fri Mar 9 00:55:30 2007
@@ -19,7 +19,6 @@
-->
<document>
<properties>
- <author email="ddewolf@apache.org">David DeWolf</author>
<title>User Guide: Testsuite</title>
</properties>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v11/app-servers.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v11/app-servers.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v11/app-servers.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v11/app-servers.xml Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
<properties>
<title>Supported Application Servers</title>
- <author email="ddewolf@apache.org">David DeWolf</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v11/architecture.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v11/architecture.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v11/architecture.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v11/architecture.xml Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
<properties>
<title>Architectural Diagrams</title>
- <author email="ddewolf@apache.org">David DeWolf</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml Fri Mar 9 00:55:30 2007
@@ -22,9 +22,6 @@
<properties>
<title>Deploying Portlet to Pluto Portal</title>
- <author email="zheng.at.apache.D0T.org">ZHENG Zhong</author>
- <author email="ddewolf@apache.org">David DeWolf</author>
- <author email="cdoremus@apache.org">Craig Doremus</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v11/getting-started.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v11/getting-started.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v11/getting-started.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v11/getting-started.xml Fri Mar 9 00:55:30 2007
@@ -22,9 +22,6 @@
<properties>
<title>Getting Started With Pluto</title>
- <author email="ddewolf@apache.org">David DeWolf</author>
- <author email="zheng.at.apache.D0T.org">ZHENG Zhong</author>
- <author email="cdoremus@apache.org">Craig Doremus</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v11/resources.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v11/resources.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v11/resources.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v11/resources.xml Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
<properties>
<title>Pluto and Portlet Resources</title>
- <author email="ddewolf@apache.org">David DeWolf</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-site/src/site/xdoc/v11/subprojects.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/src/site/xdoc/v11/subprojects.xml?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/xdoc/v11/subprojects.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/xdoc/v11/subprojects.xml Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
<properties>
<title>Pluto Subprojects</title>
- <author email="ddewolf@apache.org">David DeWolf</author>
</properties>
<body>
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java Fri Mar 9 00:55:30 2007
@@ -22,7 +22,6 @@
* The pluto assembler is used to assemble a portlet application which is
* deployable to pluto.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since Oct 15, 2004
*/
@@ -31,7 +30,7 @@
public static final String PORTLET_XML = "WEB-INF/portlet.xml";
public static final String SERVLET_XML = "WEB-INF/web.xml";
-
+
public static final String DISPATCH_SERVLET_CLASS =
"org.apache.pluto.core.PortletServlet";
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerConfig.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerConfig.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerConfig.java Fri Mar 9 00:55:30 2007
@@ -20,49 +20,48 @@
/**
* The pluto assembler configuration.
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
*/
public class AssemblerConfig {
-
+
// Private Member Variables ------------------------------------------------
-
+
/** The portlet app descriptor, which is usually WEB-INF/portlet.xml. */
- private File portletDescriptor = null;
-
+ private File portletDescriptor;
+
/** The webapp descriptor, which is usually WEB-INF/web.xml. */
- private File webappDescriptor = null;
-
+ private File webappDescriptor;
+
/** The assemble destination, which points to the assembled WAR file. */
- private File destination = null;
+ private File destination;
/** The class of the servlet that will handle portlet requests */
- private String dispatchServletClass = null;
-
+ private String dispatchServletClass;
+
/** A source WAR archive to assemble */
- private File warSource = null;
-
+ private File warSource;
+
// Public Methods ----------------------------------------------------------
-
+
public File getPortletDescriptor() {
return portletDescriptor;
}
-
+
public void setPortletDescriptor(File portletDescriptor) {
this.portletDescriptor = portletDescriptor;
}
-
+
public File getWebappDescriptor() {
return webappDescriptor;
}
-
+
public void setWebappDescriptor(File webappDescriptor) {
this.webappDescriptor = webappDescriptor;
}
-
+
public File getDestination() {
return destination;
}
-
+
public void setDestination(File destination) {
this.destination = destination;
}
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerFactory.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerFactory.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerFactory.java Fri Mar 9 00:55:30 2007
@@ -20,24 +20,22 @@
import org.apache.pluto.util.assemble.war.WarAssembler;
/**
- * The pluto assembler factory that creates an assembler.
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ * The pluto assembler factory that creates an assembler.
* @version 1.0
* @since Nov 8, 2004
*/
public class AssemblerFactory {
-
+
/** The singleton factory instance. */
private static final AssemblerFactory FACTORY = new AssemblerFactory();
-
+
/**
* Private constructor that prevents external instantiation.
*/
private AssemblerFactory() {
// Do nothing.
}
-
+
/**
* Returns the singleton factory instance.
* @return the singleton factory instance.
@@ -45,10 +43,10 @@
public static AssemblerFactory getFactory() {
return FACTORY;
}
-
-
+
+
// Public Methods ----------------------------------------------------------
-
+
/**
* Creates an assembler to assemble a portlet app WAR file to a web app WAR
* file deployable to pluto.
@@ -63,5 +61,5 @@
return new FileAssembler();
}
}
-
+
}
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/WebXmlRewritingAssembler.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/WebXmlRewritingAssembler.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/WebXmlRewritingAssembler.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/WebXmlRewritingAssembler.java Fri Mar 9 00:55:30 2007
@@ -34,16 +34,15 @@
import org.apache.pluto.descriptors.servlet.WebAppDD;
/**
- * @author Eric Dalquist <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
* @version $Revision$
* @todo fix direct dependency on pluto-descriptor-impl
*/
-public abstract class WebXmlRewritingAssembler implements Assembler {
-
+public abstract class WebXmlRewritingAssembler implements Assembler {
+
/**
* Updates the webapp descriptor by injecting portlet wrapper servlet
* definitions and mappings.
- *
+ *
* @param webXmlIn input stream to the webapp descriptor, it will be closed before the web xml is written out.
* @param portletXmlIn input stream to the portlet app descriptor, it will be closed before the web xml is written out.
* @param webXmlOut output stream to the webapp descriptor, it will be flushed and closed.
@@ -62,7 +61,7 @@
dispatchServletClass.trim().length() == 0) {
dispatchServletClass = DISPATCH_SERVLET_CLASS;
}
-
+
WebAppDescriptorService descriptorSvc = new WebAppDescriptorServiceImpl();
WebAppDD webAppDDIn = descriptorSvc.read(webXmlIn);
@@ -70,24 +69,24 @@
new PortletAppDescriptorServiceImpl();
PortletAppDD portletAppDD = portletAppDescriptorService.read(portletXmlIn);
portletXmlIn.close();
-
+
for (Iterator it = portletAppDD.getPortlets().iterator();
it.hasNext(); ) {
-
+
// Read portlet definition.
PortletDD portlet = (PortletDD) it.next();
String name = portlet.getPortletName();
ServletDD servlet = new ServletDD();
servlet.setServletName(name);
-
+
servlet.setServletClass(dispatchServletClass);
InitParamDD initParam = new InitParamDD();
initParam.setParamName("portlet-name");
initParam.setParamValue(name);
servlet.getInitParams().add(initParam);
-
+
LoadOnStartupDD onStartup = new LoadOnStartupDD();
onStartup.setPriority(1);
servlet.setLoadOnStartup(onStartup);
@@ -98,9 +97,9 @@
webAppDDIn.getServlets().add(servlet);
webAppDDIn.getServletMappings().add(servletMapping);
-
+
}
-
+
descriptorSvc.write(webAppDDIn, webXmlOut);
}
}
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssembler.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssembler.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssembler.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssembler.java Fri Mar 9 00:55:30 2007
@@ -28,38 +28,37 @@
/**
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since Nov 8, 2004
*/
public class FileAssembler extends WebXmlRewritingAssembler {
// Constructor -------------------------------------------------------------
-
+
/**
* Default no-arg constructor.
*/
public FileAssembler() {
// Do nothing.
}
-
-
+
+
// Assembler Impl ----------------------------------------------------------
-
+
public void assemble(AssemblerConfig config) throws UtilityException {
try {
final File webappDescriptor = config.getWebappDescriptor();
InputStream webXmlIn = new FileInputStream(webappDescriptor);
-
+
final File portletDescriptor = config.getPortletDescriptor();
InputStream portletXmlIn = new FileInputStream(portletDescriptor);
-
+
final File destinationDescriptor = config.getDestination();
if (webappDescriptor.equals(destinationDescriptor)) {
final File tempXml = File.createTempFile(webappDescriptor.getName() + ".", ".tmp");
final FileOutputStream webXmlOut = new FileOutputStream(tempXml);
-
+
this.updateWebappDescriptor(webXmlIn, portletXmlIn, webXmlOut, config.getDispatchServletClass());
-
+
//Move the temp file to the destination location
destinationDescriptor.delete();
tempXml.renameTo(destinationDescriptor);
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/war/WarAssembler.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/war/WarAssembler.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/war/WarAssembler.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/war/WarAssembler.java Fri Mar 9 00:55:30 2007
@@ -39,34 +39,33 @@
/**
*
- * @author Eric Dalquist <a href="mailto:edalquist@doit.wisc.edu">edalquist@doit.wisc.edu</a>
* @version 1.0
* @since Nov 8, 2004
*/
public class WarAssembler extends WebXmlRewritingAssembler {
// Constructor -------------------------------------------------------------
-
+
/**
* Default no-arg constructor.
*/
public WarAssembler() {
// Do nothing.
}
-
-
+
+
// Assembler Impl ----------------------------------------------------------
-
+
public void assemble(AssemblerConfig config) throws UtilityException {
try {
final File sourceArchive = config.getWarSource();
final File destinationFolder = config.getDestination();
final File destinationArchive = new File(destinationFolder, sourceArchive.getName());
-
+
//If the source and dest are the same a temp location is needed
if (sourceArchive.equals(destinationArchive)) {
final File tempArchive = File.createTempFile(sourceArchive.getName() + ".", ".tmp");
this.assembleWar(sourceArchive, tempArchive, config.getDispatchServletClass());
-
+
//Move the temp file to the destination location
destinationArchive.delete();
tempArchive.renameTo(destinationArchive);
@@ -74,12 +73,12 @@
else {
this.assembleWar(sourceArchive, destinationArchive, config.getDispatchServletClass());
}
-
+
} catch (IOException ex) {
throw new UtilityException(ex.getMessage(), ex, null);
}
}
-
+
/**
* Reads the source JAR copying entries to the dest JAR. The web.xml and portlet.xml are cached
* and after the entire archive is copied (minus the web.xml) a re-written web.xml is generated
@@ -87,7 +86,7 @@
*/
protected void assembleWar(File source, File dest, String dispatchServletClass) throws IOException {
final JarInputStream jarIn = new JarInputStream(new FileInputStream(source));
-
+
try {
//Create the output JAR stream, copying the Manifest
final Manifest manifest = jarIn.getManifest();
@@ -100,12 +99,12 @@
JarEntry servletXmlEntry = null;
byte[] servletXmlBuffer = null;
byte[] portletXmlBuffer = null;
-
+
//Read the source archive entry by entry
JarEntry originalJarEntry;
while ((originalJarEntry = jarIn.getNextJarEntry()) != null) {
final JarEntry newJarEntry = this.smartClone(originalJarEntry);
-
+
//Capture the web.xml JarEntry and contents as a byte[], don't write it out now
if (SERVLET_XML.equals(newJarEntry.getName())) {
servletXmlEntry = newJarEntry;
@@ -123,7 +122,7 @@
IOUtils.copy(jarIn, jarOut);
}
}
-
+
//Checks to make sure the web.xml and portlet.xml were found
if (servletXmlBuffer == null) {
throw new FileNotFoundException("File '" + SERVLET_XML + "' could not be found in the archive '" + source + "'");
@@ -131,25 +130,25 @@
if (portletXmlBuffer == null) {
throw new FileNotFoundException("File '" + PORTLET_XML + "' could not be found in the archive '" + source + "'");
}
-
+
//Create streams of the byte[] data for the updater method
final InputStream webXmlIn = new ByteArrayInputStream(servletXmlBuffer);
final InputStream portletXmlIn = new ByteArrayInputStream(portletXmlBuffer);
final ByteArrayOutputStream webXmlOut = new ByteArrayOutputStream(servletXmlBuffer.length);
-
+
//Update the web.xml
this.updateWebappDescriptor(webXmlIn, portletXmlIn, webXmlOut, dispatchServletClass);
final byte[] webXmlBytes = webXmlOut.toByteArray();
-
+
//If no compression is being used (STORED) we have to manually update the size and crc
if (servletXmlEntry.getMethod() == ZipEntry.STORED) {
servletXmlEntry.setSize(webXmlBytes.length);
-
+
final CRC32 webXmlCrc = new CRC32();
webXmlCrc.update(webXmlBytes);
servletXmlEntry.setCrc(webXmlCrc.getValue());
}
-
+
//write out the web.xml entry and contents
jarOut.putNextEntry(servletXmlEntry);
IOUtils.write(webXmlBytes, jarOut);
@@ -177,7 +176,7 @@
newJarEntry.setSize(originalJarEntry.getSize());
newJarEntry.setCrc(originalJarEntry.getCrc());
}
-
+
return newJarEntry;
}
}
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java Fri Mar 9 00:55:30 2007
@@ -34,7 +34,6 @@
/**
* Command Line Interface to the Pluto Assembler.
*
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since Oct 15, 2004
*/
@@ -92,7 +91,7 @@
config.setWebappDescriptor(webXml);
config.setPortletDescriptor(portletXml);
config.setDestination(webXml);
-
+
Assembler assembler = AssemblerFactory.getFactory()
.createAssembler(config);
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java Fri Mar 9 00:55:30 2007
@@ -16,22 +16,25 @@
*/
package org.apache.pluto.util.install.file;
-import java.io.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.PrintWriter;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* TODO JavaDoc
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>:
* @version 1.0
* @since Dec 11, 2005
*/
public class TomcatCrossContextGenerator {
private static final String PLUTO_TEMP_DIR = "PlutoDomain";
private static Log LOG = LogFactory.getLog(TomcatCrossContextGenerator.class);
-
+
public static void main(String[] args) throws IOException {
File tomcatHome = new File(args[0]);
@@ -48,13 +51,13 @@
}
/**
- * Creates a tomcat-specific context deployment descriptor
+ * Creates a tomcat-specific context deployment descriptor
* and deploys it.
- *
+ *
* @param confDir Tomcat conf directory
* @param fileName File name of the war
* @param contextName The root name of the context file
- * @throws IOException If there is a problem
+ * @throws IOException If there is a problem
*/
public static void createContextFile(File confDir, String fileName, String contextName) throws IOException {
PrintWriter out = null;
@@ -66,14 +69,14 @@
.append("crossContext=\"true\">").append("</Context>");
File confFile = new File(confDir, contextName+".xml");
if (LOG.isInfoEnabled()) {
- LOG.info("Writing file: "+ confFile.getAbsolutePath());
+ LOG.info("Writing file: "+ confFile.getAbsolutePath());
}
out = new PrintWriter(new FileWriter(confFile));
out.println(contents.toString());
} finally {
if (out != null) {
out.flush();
- out.close();
+ out.close();
}
}
}
Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java (original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java Fri Mar 9 00:55:30 2007
@@ -26,23 +26,22 @@
import org.custommonkey.xmlunit.XMLUnit;
/**
- * @author Eric Dalquist <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
* @version $Revision$
*/
public class FileAssemblerTest extends XMLTestCase {
- private File webXmlFile = null;
- private File portletXmlFile = null;
- private File assembledWebXmlFile = null;
-
+ private File webXmlFile;
+ private File portletXmlFile;
+ private File assembledWebXmlFile;
+
protected void setUp() throws Exception {
XMLUnit.setIgnoreWhitespace(true);
-
+
final URL webXmlUrl = this.getClass().getResource("/org/apache/pluto/util/assemble/file/web.xml");
this.webXmlFile = new File(webXmlUrl.getFile());
-
+
final URL portletXmlUrl = this.getClass().getResource("/org/apache/pluto/util/assemble/file/portlet.xml");
this.portletXmlFile = new File(portletXmlUrl.getFile());
-
+
final URL assembledWebXmlUrl = this.getClass().getResource("/org/apache/pluto/util/assemble/file/assembled.web.xml");
this.assembledWebXmlFile = new File(assembledWebXmlUrl.getFile());
}
@@ -54,35 +53,35 @@
public void testAssembleToNewDirectory() throws Exception {
AssemblerConfig config = new AssemblerConfig();
-
+
final File webXmlFileDest = File.createTempFile(this.webXmlFile.getName() + ".", ".xml");
webXmlFileDest.deleteOnExit();
config.setWebappDescriptor(this.webXmlFile);
config.setPortletDescriptor(this.portletXmlFile);
config.setDestination(webXmlFileDest);
-
+
FileAssembler assembler = new FileAssembler();
assembler.assemble(config);
assertXMLEqual(new FileReader(this.assembledWebXmlFile), new FileReader(webXmlFileDest));
}
-
+
public void testAssembleOverSelf() throws Exception {
AssemblerConfig config = new AssemblerConfig();
-
+
final File webXmlFileCopy = File.createTempFile(this.webXmlFile.getName() + ".", ".source.xml");
webXmlFileCopy.deleteOnExit();
FileUtils.copyFile(this.webXmlFile, webXmlFileCopy);
-
+
config.setWebappDescriptor(webXmlFileCopy);
config.setPortletDescriptor(this.portletXmlFile);
config.setDestination(webXmlFileCopy);
-
+
FileAssembler assembler = new FileAssembler();
assembler.assemble(config);
-
+
assertXMLEqual(new FileReader(this.assembledWebXmlFile), new FileReader(webXmlFileCopy));
}
}
Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java (original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java Fri Mar 9 00:55:30 2007
@@ -26,12 +26,11 @@
import org.apache.pluto.util.assemble.AssemblerConfig;
/**
- * @author Eric Dalquist <a href="mailto:eric.dalquist@doit.wisc.edu">eric.dalquist@doit.wisc.edu</a>
* @version $Revision$
*/
public class WarAssemblerTest extends TestCase {
- private File portletFile = null;
-
+ private File portletFile;
+
protected void setUp() throws Exception {
final URL portletUrl = this.getClass().getResource("/org/apache/pluto/util/assemble/war/WarDeployerTestPortlet.war");
this.portletFile = new File(portletUrl.getFile());
@@ -43,31 +42,31 @@
public void testAssembleToNewDirectory() throws Exception {
AssemblerConfig config = new AssemblerConfig();
-
+
config.setWarSource(this.portletFile);
-
+
final File tempDir = getTempDir();
config.setDestination(tempDir);
-
+
WarAssembler assembler = new WarAssembler();
assembler.assemble(config);
-
+
//How to validate it worked?
}
-
+
public void testAssembleOverSelf() throws Exception {
AssemblerConfig config = new AssemblerConfig();
-
+
final File portletCopy = File.createTempFile(this.portletFile.getName() + ".", ".war");
portletCopy.deleteOnExit();
FileUtils.copyFile(this.portletFile, portletCopy);
-
+
config.setWarSource(portletCopy);
config.setDestination(portletCopy.getParentFile());
-
+
WarAssembler assembler = new WarAssembler();
assembler.assemble(config);
-
+
//How to validate it worked?
}