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 ms...@apache.org on 2015/11/27 13:38:01 UTC
[20/38] portals-pluto git commit: moved pluto servlet version to 3.1.
removed some debugging code
moved pluto servlet version to 3.1. removed some debugging code
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/0b1bf068
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/0b1bf068
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/0b1bf068
Branch: refs/heads/V3Prototype
Commit: 0b1bf0683eb002d3c5fa05076b61b677cf44edbf
Parents: 536c860
Author: Scott Nicklous <ms...@apache.org>
Authored: Fri Oct 30 10:36:16 2015 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Fri Oct 30 10:36:16 2015 +0100
----------------------------------------------------------------------
.../om/portlet/impl/ConfigurationHolder.java | 29 --------------------
pluto-portal/src/main/webapp/WEB-INF/web.xml | 17 ++++--------
2 files changed, 5 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/0b1bf068/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java
index 51fdab9..f93904e 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/ConfigurationHolder.java
@@ -120,35 +120,6 @@ public class ConfigurationHolder {
*/
public void processPortletDD(InputStream stream)
throws IOException, IllegalArgumentException, JAXBException, XMLStreamException {
-
- if (isDebug) {
- StringBuilder txt = new StringBuilder(128);
- txt.append("Info about classloaders:");
- ClassLoader mycl = this.getClass().getClassLoader();
- ClassLoader jaxbcl = JAXBContext.class.getClassLoader();
- ClassLoader ofcl = org.apache.pluto.container.om.portlet20.impl.ObjectFactory.class.getClassLoader();
- ClassLoader syscl = null;
- try {syscl = ClassLoader.getSystemClassLoader();} catch(Exception e) {}
- txt.append("\nmy classloader: ").append((mycl != null) ? mycl.toString() : "null");
- txt.append("\njaxb classloader: ").append((jaxbcl != null) ? jaxbcl.toString() : "null");
- txt.append("\nof classloader: ").append((ofcl != null) ? ofcl.toString() : "null");
- txt.append("\nsys classloader: ").append((syscl != null) ? syscl.toString() : "null");
- Class<?> myof = null;
- Class<?> jaxbof = null;
- Class<?> ofof = null;
- Class<?> sysof = null;
- String clsName = "org.apache.pluto.container.om.portlet20.impl.ObjectFactory";
- try {myof = mycl.loadClass(clsName);} catch(Exception e) {}
- try {jaxbof = jaxbcl.loadClass(clsName);} catch(Exception e) {}
- try {ofof = ofcl.loadClass(clsName);} catch(Exception e) {}
- try {sysof = syscl.loadClass(clsName);} catch(Exception e) {}
- txt.append("\nNow attempting to load: ").append(clsName);
- txt.append("\nMycl loaded: ").append(myof != null);
- txt.append("\nJaxbofcl loaded: ").append(jaxbof != null);
- txt.append("\nOfcl loaded: ").append(ofof != null);
- txt.append("\nSyscl loaded: ").append(sysof != null);
- LOG.debug(txt.toString());
- }
ClassLoader mycl = this.getClass().getClassLoader();
JAXBContext cntxt = JAXBContext.newInstance(JAXB_CONTEXT, mycl);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/0b1bf068/pluto-portal/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/web.xml b/pluto-portal/src/main/webapp/WEB-INF/web.xml
index 7db86e3..60fdba0 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/web.xml
+++ b/pluto-portal/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -55,13 +55,6 @@ limitations under the License.
<display-name>Pluto Portal Driver</display-name>
<servlet-name>plutoPortalDriver</servlet-name>
<servlet-class>org.apache.pluto.driver.PortalDriverServlet</servlet-class>
-<!-- we'll probably want to implement multipart support in a different manner.
- <multipart-config>
- <max-file-size>10485760</max-file-size>
- <max-request-size>20971520</max-request-size>
- <file-size-threshold>5242880</file-size-threshold>
- </multipart-config>
--->
</servlet>
<servlet>