gatein SVN: r5250 - in portal/branches/navcontroller/component/web/controller/src: test/java/org/exoplatform/web/controller/router and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-11-24 10:42:47 -0500 (Wed, 24 Nov 2010)
New Revision: 5250
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java
Log:
change / escape to _ char instead of tilda
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-11-24 15:02:41 UTC (rev 5249)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-11-24 15:42:47 UTC (rev 5250)
@@ -45,7 +45,7 @@
{
/** Julien : make that configurable. */
- private static final char slashEscape = '~';
+ private static final char slashEscape = '_';
/** . */
private Route parent;
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-24 15:02:41 UTC (rev 5249)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-24 15:42:47 UTC (rev 5250)
@@ -124,7 +124,7 @@
Router router = new Router(routerMD);
//
- assertEquals(Collections.singletonMap(QualifiedName.create("p"), "/"), router.route("/~"));
+ assertEquals(Collections.singletonMap(QualifiedName.create("p"), "/"), router.route("/_"));
}
public void testPreservePath() throws Exception
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java 2010-11-24 15:02:41 UTC (rev 5249)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java 2010-11-24 15:42:47 UTC (rev 5250)
@@ -129,12 +129,12 @@
Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
expectedParameters.put(QualifiedName.create("gtn", "controller"), "site");
expectedParameters.put(QualifiedName.create("gtn", "sitetype"), "group");
- expectedParameters.put(QualifiedName.create("gtn", "sitename"), "platform_administrator");
+ expectedParameters.put(QualifiedName.create("gtn", "sitename"), "platform");
expectedParameters.put(QualifiedName.create("gtn", "path"), "/administration/registry");
//
- assertEquals(expectedParameters, router.route("/private/group/platform_administrator/administration/registry"));
- assertEquals("/private/group/platform_administrator/administration/registry", router.render(expectedParameters));
+ assertEquals(expectedParameters, router.route("/private/group/platform/administration/registry"));
+ assertEquals("/private/group/platform/administration/registry", router.render(expectedParameters));
Map<QualifiedName, String> expectedParameters1 = new HashMap<QualifiedName, String>();
expectedParameters1.put(QualifiedName.create("gtn", "controller"), "site");
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java 2010-11-24 15:02:41 UTC (rev 5249)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java 2010-11-24 15:42:47 UTC (rev 5250)
@@ -113,7 +113,7 @@
Router router = new Router(routerMD);
//
- assertEquals("/~", router.render(Collections.singletonMap(QualifiedName.create("p"), "/")));
+ assertEquals("/_", router.render(Collections.singletonMap(QualifiedName.create("p"), "/")));
}
public void testWildcardParamPathPreservePathEncoding() throws Exception
@@ -133,7 +133,7 @@
Router router = new Router(routerMD);
//
- assertEquals("/~", router.render(Collections.singletonMap(QualifiedName.create("p"), "/")));
+ assertEquals("/_", router.render(Collections.singletonMap(QualifiedName.create("p"), "/")));
}
public void testPrecedence() throws Exception
14 years, 1 month
gatein SVN: r5249 - portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-11-24 10:02:41 -0500 (Wed, 24 Nov 2010)
New Revision: 5249
Modified:
portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml
Log:
simplify config
Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml
===================================================================
--- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-24 13:33:41 UTC (rev 5248)
+++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-24 15:02:41 UTC (rev 5249)
@@ -28,12 +28,10 @@
</route>
<!-- The group access -->
- <route path="/groups">
+ <route path="/groups/{gtn:sitename}{gtn:path}">
<route-param name="gtn:access" value="private"/>
- <route path="/{gtn:sitename}{gtn:path}">
- <route-param name="gtn:sitetype" value="group"/>
- <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/>
- </route>
+ <route-param name="gtn:sitetype" value="group"/>
+ <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/>
</route>
<!-- The user access -->
14 years, 1 month
gatein SVN: r5248 - in portal/trunk: gadgets/eXoGadgets/src/main/webapp/META-INF and 9 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-11-24 08:33:41 -0500 (Wed, 24 Nov 2010)
New Revision: 5248
Added:
portal/trunk/gadgets/eXoGadgets/src/main/webapp/META-INF/
portal/trunk/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml
portal/trunk/web/eXoResources/src/main/webapp/META-INF/
portal/trunk/web/eXoResources/src/main/webapp/META-INF/context.xml
portal/trunk/web/portal/src/main/webapp/META-INF/
portal/trunk/web/portal/src/main/webapp/META-INF/context.xml
portal/trunk/web/rest/src/main/webapp/META-INF/
portal/trunk/web/rest/src/main/webapp/META-INF/context.xml
Removed:
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/Catalina/localhost/
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/producer.server.xml
portal/trunk/web/portal/src/main/resources/
Log:
GTNPORTAL-1688 : Tomcat configuration sanitization
Added: portal/trunk/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml (rev 0)
+++ portal/trunk/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml 2010-11-24 13:33:41 UTC (rev 5248)
@@ -0,0 +1,22 @@
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<Context path="/eXoGadgetServer" docBase="eXoGadgetServer" debug="0" reloadable="true" crossContext="true"/>
Deleted: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/producer.server.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/producer.server.xml 2010-11-24 13:29:04 UTC (rev 5247)
+++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/producer.server.xml 2010-11-24 13:33:41 UTC (rev 5248)
@@ -1,387 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<!-- Example Server Configuration File -->
-<!-- Note that component elements are nested corresponding to their
- parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
- which may contain one or more "Service" instances. The Server
- listens for a shutdown command on the indicated port.
-
- Note: A "Server" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
-<Server port="8006" shutdown="SHUTDOWN" debug="0">
-
-
- <!-- Comment these entries out to disable JMX MBeans support -->
- <!-- You may also configure custom components (e.g. Valves/Realms) by
- including your own mbean-descriptor file(s), and setting the
- "descriptors" attribute to point to a ';' seperated list of paths
- (in the ClassLoader sense) of files to add to the default list.
- e.g. descriptors="/com/myfirm/mypackage/mbean-descriptor.xml"
- -->
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
- debug="0"/>
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
- debug="0"/>
-
- <!-- Global JNDI resources -->
- <GlobalNamingResources>
-
- <!-- Test entry for demonstration purposes -->
- <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
- <!-- Editable user database that can also be used by
- UserDatabaseRealm to authenticate users -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved">
- </Resource>
- <ResourceParams name="UserDatabase">
- <parameter>
- <name>factory</name>
- <value>org.apache.catalina.users.MemoryUserDatabaseFactory</value>
- </parameter>
- <parameter>
- <name>pathname</name>
- <value>conf/tomcat-users.xml</value>
- </parameter>
- </ResourceParams>
-
- </GlobalNamingResources>
-
- <!-- A "Service" is a collection of one or more "Connectors" that share
- a single "Container" (and therefore the web applications visible
- within that Container). Normally, that Container is an "Engine",
- but this is not required.
-
- Note: A "Service" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
- <!-- Define the Tomcat Stand-Alone Service -->
- <Service name="Catalina">
-
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Each Connector passes requests on to the
- associated "Container" (normally an Engine) for processing.
-
- By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
- You can also enable an SSL HTTP/1.1 Connector on port 8443 by
- following the instructions below and uncommenting the second Connector
- entry. SSL support requires the following steps (see the SSL Config
- HOWTO in the Tomcat 5 documentation bundle for more detailed
- instructions):
- * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
- later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
- * Execute:
- %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
- $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix)
- with a password value of "changeit" for both the certificate and
- the keystore itself.
-
- By default, DNS lookups are enabled when a web application calls
- request.getRemoteHost(). This can have an adverse impact on
- performance, so you can disable it by setting the
- "enableLookups" attribute to "false". When DNS lookups are disabled,
- request.getRemoteHost() will return the String version of the
- IP address of the remote client.
- -->
-
- <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
- <Connector port="8081"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" redirectPort="8444" acceptCount="100"
- debug="0" connectionTimeout="20000"
- disableUploadTimeout="true" />
- <!-- Note : To disable connection timeouts, set connectionTimeout value
- to -1 -->
-
- <!-- Note : To use gzip compression you could set the following properties :
-
- compression="on"
- compressionMinSize="2048"
- noCompressionUserAgents="gozilla, traviata"
- compressableMimeType="text/html,text/xml"
- -->
-
- <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
- <!--
- <Connector port="8444"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" disableUploadTimeout="true"
- acceptCount="100" debug="0" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS" />
- -->
-
- <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
- <Connector port="8010"
- enableLookups="false" redirectPort="8444" debug="0"
- protocol="AJP/1.3" />
-
- <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
- <!-- See proxy documentation for more information about using this. -->
- <!--
- <Connector port="8083"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false"
- acceptCount="100" debug="0" connectionTimeout="20000"
- proxyPort="81" disableUploadTimeout="true" />
- -->
-
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host). -->
-
- <!-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
- <Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1">
- -->
-
- <!-- Define the top level container in our container hierarchy -->
- <Engine name="Catalina" defaultHost="localhost" debug="0">
-
- <!-- The request dumper valve dumps useful debugging information about
- the request headers and cookies that were received, and the response
- headers and cookies that were sent, for all requests received by
- this instance of Tomcat. If you care only about requests to a
- particular virtual host, or a particular application, nest this
- element inside the corresponding <Host> or <Context> entry instead.
-
- For a similar mechanism that is portable to all Servlet 2.4
- containers, check out the "RequestDumperFilter" Filter in the
- example application (the source for this filter may be found in
- "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
- Request dumping is disabled by default. Uncomment the following
- element to enable it. -->
- <!--
- <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
- -->
-
- <!-- Global logger unless overridden at lower levels -->
- <Logger className="org.apache.catalina.logger.FileLogger"
- prefix="catalina_log." suffix=".txt"
- timestamp="true"/>
-
- <!-- Because this Realm is here, an instance will be shared globally -->
-
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- debug="0" resourceName="UserDatabase"/>
-
- <!-- Comment out the old realm but leave here for now in case we
- need to go back quickly -->
- <!--
- <Realm className="org.apache.catalina.realm.MemoryRealm" />
- -->
-
- <!-- Replace the above Realm with one of the following to get a Realm
- stored in a database and accessed via JDBC -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
- driverName="org.gjt.mm.mysql.Driver"
- connectionURL="jdbc:mysql://localhost/authority"
- connectionName="test" connectionPassword="test"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
- driverName="oracle.jdbc.driver.OracleDriver"
- connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
- connectionName="scott" connectionPassword="tiger"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
- driverName="sun.jdbc.odbc.JdbcOdbcDriver"
- connectionURL="jdbc:odbc:CATALINA"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!-- Define the default virtual host
- Note: XML Schema validation will not work with Xerces 2.2.
- -->
- <Host name="localhost" debug="0" appBase="webapps"
- unpackWARs="true" autoDeploy="true"
- xmlValidation="false" xmlNamespaceAware="false">
-
- <!-- Defines a cluster for this node,
- By defining this element, means that every manager will be changed.
- So when running a cluster, only make sure that you have webapps in there
- that need to be clustered and remove the other ones.
- A cluster has the following parameters:
-
- className = the fully qualified name of the cluster class
-
- name = a descriptive name for your cluster, can be anything
-
- debug = the debug level, higher means more output
-
- mcastAddr = the multicast address, has to be the same for all the nodes
-
- mcastPort = the multicast port, has to be the same for all the nodes
-
- mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
-
- mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
-
- tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes
-
- tcpListenAddress = the listen address (bind address) for TCP cluster request on this host,
- in case of multiple ethernet cards.
- auto means that address becomes
- InetAddress.getLocalHost().getHostAddress()
-
- tcpListenPort = the tcp listen port
-
- tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
- has a wakup bug in java.nio. Set to 0 for no timeout
-
- printToScreen = true means that managers will also print to std.out
-
- expireSessionsOnShutdown = true means that
-
- useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
- false means to replicate the session after each request.
- false means that replication would work for the following piece of code:
- <%
- HashMap map = (HashMap)session.getAttribute("map");
- map.put("key","value");
- %>
- replicationMode = can be either 'synchronous' or 'asynchronous'.
- * Synchronous means that the thread that executes the request, is also the
- thread the replicates the data to the other nodes, and will not return until all
- nodes have received the information.
- * Asynchronous means that there is a specific 'sender' thread for each cluster node,
- so the request thread will queue the replication request into a "smart" queue,
- and then return to the client.
- The "smart" queue is a queue where when a session is added to the queue, and the same session
- already exists in the queue from a previous request, that session will be replaced
- in the queue instead of replicating two requests. This almost never happens, unless there is a
- large network delay.
- -->
-
- <!-- When uncommenting the cluster, REMEMBER to uncomment the replication Valve below as well
-
-
- <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
- name="FilipsCluster"
- debug="10"
- serviceclass="org.apache.catalina.cluster.mcast.McastService"
- mcastAddr="228.0.0.4"
- mcastPort="45565"
- mcastFrequency="500"
- mcastDropTime="3000"
- tcpThreadCount="2"
- tcpListenAddress="auto"
- tcpListenPort="4002"
- tcpSelectorTimeout="100"
- printToScreen="false"
- expireSessionsOnShutdown="false"
- useDirtyFlag="true"
- replicationMode="synchronous"
- />
- -->
- <!--
- When configuring for clustering, you also add in a valve to catch all the requests
- coming in, at the end of the request, the session may or may not be replicated.
- A session is replicated if and only if all the conditions are met:
- 1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
- 2. a session exists (has been created)
- 3. the request is not trapped by the "filter" attribute
-
- The filter attribute is to filter out requests that could not modify the session,
- hence we don't replicate the session after the end of this request.
- The filter is negative, ie, anything you put in the filter, you mean to filter out,
- ie, no replication will be done on requests that match one of the filters.
- The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
-
- filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
- ending with .gif and .js are intercepted.
- -->
- <!--
- <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
- filter=".*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;"/>
-
- -->
- <!-- Normally, users must authenticate themselves to each web app
- individually. Uncomment the following entry if you would like
- a user to be authenticated the first time they encounter a
- resource protected by a security constraint, and then have that
- user identity maintained across *all* web applications contained
- in this virtual host. -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn"
- debug="0"/>
- -->
-
- <!-- Access log processes all requests for this virtual host. By
- default, log files are created in the "logs" directory relative to
- $CATALINA_HOME. If you wish, you can specify a different
- directory with the "directory" attribute. Specify either a relative
- (to $CATALINA_HOME) or absolute path to the desired directory.
- -->
- <!--
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common" resolveHosts="false"/>
- -->
-
- <!-- Logger shared by all Contexts related to this virtual host. By
- default (when using FileLogger), log files are created in the "logs"
- directory relative to $CATALINA_HOME. If you wish, you can specify
- a different directory with the "directory" attribute. Specify either a
- relative (to $CATALINA_HOME) or absolute path to the desired
- directory.-->
- <Logger className="org.apache.catalina.logger.FileLogger"
- directory="logs" prefix="localhost_log." suffix=".txt"
- timestamp="true"/>
-
- <!-- Define properties for each web application. This is only needed
- if you want to set non-default properties, or have web application
- document roots in places other than the virtual host's appBase
- directory. -->
-
- <!-- Tomcat Root Context -->
- <!--
- <Context path="" docBase="ROOT" debug="0">
- -->
-
- </Host>
-
- </Engine>
-
- </Service>
-
-</Server>
Added: portal/trunk/web/eXoResources/src/main/webapp/META-INF/context.xml
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/META-INF/context.xml (rev 0)
+++ portal/trunk/web/eXoResources/src/main/webapp/META-INF/context.xml 2010-11-24 13:33:41 UTC (rev 5248)
@@ -0,0 +1,22 @@
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<Context path="/eXoResources" docBase="eXoResources" debug="0" reloadable="true" crossContext="true"/>
Added: portal/trunk/web/portal/src/main/webapp/META-INF/context.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/META-INF/context.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/META-INF/context.xml 2010-11-24 13:33:41 UTC (rev 5248)
@@ -0,0 +1,31 @@
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<Context path='/portal' docBase='portal' debug='0' reloadable='true' crossContext='true' privileged='true'>
+ <Realm className='org.apache.catalina.realm.JAASRealm'
+ appName='gatein-domain'
+ userClassNames='org.exoplatform.services.security.jaas.UserPrincipal'
+ roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal'
+ debug='0' cache='false'/>
+ <Valve
+ className='org.apache.catalina.authenticator.FormAuthenticator'
+ characterEncoding='UTF-8'/>
+</Context>
Added: portal/trunk/web/rest/src/main/webapp/META-INF/context.xml
===================================================================
--- portal/trunk/web/rest/src/main/webapp/META-INF/context.xml (rev 0)
+++ portal/trunk/web/rest/src/main/webapp/META-INF/context.xml 2010-11-24 13:33:41 UTC (rev 5248)
@@ -0,0 +1,29 @@
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<Context path="/rest" docBase="rest" reloadable="true" crossContext="false">
+
+ <Realm className='org.apache.catalina.realm.JAASRealm'
+ appName='gatein-domain'
+ userClassNames="org.exoplatform.services.security.jaas.UserPrincipal"
+ roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal"
+ debug='0' cache='false'/>
+</Context>
14 years, 1 month
gatein SVN: r5247 - portal/trunk/packaging/tomcat/integration.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-11-24 08:29:04 -0500 (Wed, 24 Nov 2010)
New Revision: 5247
Modified:
portal/trunk/packaging/tomcat/integration/
Log:
ignore target directory
Property changes on: portal/trunk/packaging/tomcat/integration
___________________________________________________________________
Name: svn:ignore
+ target
14 years, 1 month
gatein SVN: r5246 - portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-24 07:35:47 -0500 (Wed, 24 Nov 2010)
New Revision: 5246
Modified:
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java
Log:
GTNPORTAL-1687: Invalid URLs in gadgets generate exceptions
Modified: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java
===================================================================
--- portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java 2010-11-24 12:31:02 UTC (rev 5245)
+++ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java 2010-11-24 12:35:47 UTC (rev 5246)
@@ -57,6 +57,9 @@
/** . */
private ServletContext ctx;
+ /** . */
+ private static final Logger log = LoggerFactory.getLogger(ProxyServletFilter.class);
+
public void init(FilterConfig cfg) throws ServletException
{
this.ctx = cfg.getServletContext();
@@ -90,14 +93,23 @@
}
else
{
- URI uri = URI.create(url);
- if (!service.accept(hreq, container, uri))
+ try
{
- hresp.sendError(HttpServletResponse.SC_FORBIDDEN, "Gadget " + url + " is blacklisted");
+ URI uri = URI.create(url);
+ if (!service.accept(hreq, container, uri))
+ {
+ hresp.sendError(HttpServletResponse.SC_FORBIDDEN, "Gadget " + url + " is blacklisted");
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+
}
- else
+ catch (java.lang.IllegalArgumentException e)
{
- chain.doFilter(req, resp);
+ // It happens that some URLs can be wrong, I've seen this with "http://" as URL in one of the Google Gadgets
+ logger.debug("Invalid URL: " + url;
}
}
}
14 years, 1 month
gatein SVN: r5245 - epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-24 07:31:02 -0500 (Wed, 24 Nov 2010)
New Revision: 5245
Modified:
epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java
Log:
JBEPP-670: Invalid URLs in gadgets generate exceptions
Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java 2010-11-24 04:20:00 UTC (rev 5244)
+++ epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java 2010-11-24 12:31:02 UTC (rev 5245)
@@ -57,6 +57,9 @@
/** . */
private ServletContext ctx;
+ /** . */
+ private static final Logger log = LoggerFactory.getLogger(ProxyServletFilter.class);
+
public void init(FilterConfig cfg) throws ServletException
{
this.ctx = cfg.getServletContext();
@@ -90,14 +93,23 @@
}
else
{
- URI uri = URI.create(url);
- if (!service.accept(hreq, container, uri))
+ try
{
- hresp.sendError(HttpServletResponse.SC_FORBIDDEN, "Gadget " + url + " is blacklisted");
+ URI uri = URI.create(url);
+ if (!service.accept(hreq, container, uri))
+ {
+ hresp.sendError(HttpServletResponse.SC_FORBIDDEN, "Gadget " + url + " is blacklisted");
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+
}
- else
+ catch (java.lang.IllegalArgumentException e)
{
- chain.doFilter(req, resp);
+ // It happens that some URLs can be wrong, I've seen this with "http://" as URL in one of the Google Gadgets
+ logger.debug("Invalid URL: " + url;
}
}
}
14 years, 1 month
gatein SVN: r5244 - in portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui: container and 2 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2010-11-23 23:20:00 -0500 (Tue, 23 Nov 2010)
New Revision: 5244
Modified:
portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerActionListener.java
portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java
portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java
Log:
GTNPORTAL-1682 Fix some NPE case when change UIComponentDecorator class
Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-11-24 04:01:32 UTC (rev 5243)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-11-24 04:20:00 UTC (rev 5244)
@@ -864,8 +864,7 @@
{
public void execute(Event<UIPortlet> event) throws Exception
{
- UIPortal uiPortal = Util.getUIPortal();
- UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class);
+ UIPortalApplication uiApp = Util.getUIPortalApplication();
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
uiMaskWS.setUpdated(true);
UIPortlet uiPortlet = event.getSource();
Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerActionListener.java 2010-11-24 04:01:32 UTC (rev 5243)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerActionListener.java 2010-11-24 04:20:00 UTC (rev 5244)
@@ -39,8 +39,7 @@
{
UIContainer uiContainer = event.getSource();
- UIPortal uiPortal = Util.getUIPortal();
- UIPortalApplication uiApp = uiPortal.getAncestorOfType(UIPortalApplication.class);
+ UIPortalApplication uiApp = Util.getUIPortalApplication();
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
UIContainerForm containerForm = uiMaskWS.createUIComponent(UIContainerForm.class, null, null);
containerForm.setValues(uiContainer);
Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2010-11-24 04:01:32 UTC (rev 5243)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2010-11-24 04:20:00 UTC (rev 5244)
@@ -141,7 +141,7 @@
event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWorkspace);
- UIPortalApplication uiPortalApp = uiForm.getAncestorOfType(UIPortalApplication.class);
+ UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-11-24 04:01:32 UTC (rev 5243)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-11-24 04:20:00 UTC (rev 5244)
@@ -59,7 +59,7 @@
public void execute(Event<UIPortal> event) throws Exception
{
UIPortal showedUIPortal = event.getSource();
- UIPortalApplication uiPortalApp = showedUIPortal.getAncestorOfType(UIPortalApplication.class);
+ UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
//This code snippet is to make sure that Javascript/Skin is fully loaded at the first request
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2010-11-24 04:01:32 UTC (rev 5243)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2010-11-24 04:20:00 UTC (rev 5244)
@@ -47,6 +47,7 @@
{
context.addUIComponentToUpdateByAjax(uicomponent.<UIComponent>getChildById(UIPortalApplication.UI_WORKING_WS_ID));
context.addUIComponentToUpdateByAjax(uicomponent.getChild(UIMaskWorkspace.class));
+ ((PortalRequestContext)context).setFullRender(true);
return;
}
if (uiTarget == uicomponent)
14 years, 1 month
gatein SVN: r5243 - exo/portal/branches/3.1.x/testsuite.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-11-23 23:01:32 -0500 (Tue, 23 Nov 2010)
New Revision: 5243
Added:
exo/portal/branches/3.1.x/testsuite/eXo_RegressTest_GateIn_3.1.x_TestDefinition.ods
Log:
TESTVN-2052 - Verify Normalization and completeness of TestDefinitions for GateIn product in PLF - GateIn 3.1.x
Added: exo/portal/branches/3.1.x/testsuite/eXo_RegressTest_GateIn_3.1.x_TestDefinition.ods
===================================================================
(Binary files differ)
Property changes on: exo/portal/branches/3.1.x/testsuite/eXo_RegressTest_GateIn_3.1.x_TestDefinition.ods
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 1 month
gatein SVN: r5242 - portal/branches/branch-GTNPORTAL-1643/webui/framework/src/main/java/org/exoplatform/webui/core.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2010-11-23 21:17:07 -0500 (Tue, 23 Nov 2010)
New Revision: 5242
Modified:
portal/branches/branch-GTNPORTAL-1643/webui/framework/src/main/java/org/exoplatform/webui/core/UIComponentDecorator.java
Log:
GTNPORTAL-1682 Set null for old uicomponent parent
Modified: portal/branches/branch-GTNPORTAL-1643/webui/framework/src/main/java/org/exoplatform/webui/core/UIComponentDecorator.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/framework/src/main/java/org/exoplatform/webui/core/UIComponentDecorator.java 2010-11-23 23:48:21 UTC (rev 5241)
+++ portal/branches/branch-GTNPORTAL-1643/webui/framework/src/main/java/org/exoplatform/webui/core/UIComponentDecorator.java 2010-11-24 02:17:07 UTC (rev 5242)
@@ -51,11 +51,18 @@
public UIComponent setUIComponent(UIComponent uicomponent)
{
UIComponent oldOne = uicomponent_;
-// if (uicomponent_ != null)
-// uicomponent_.setParent(null);
+ if (uicomponent_ != null)
+ uicomponent_.setParent(null);
uicomponent_ = uicomponent;
if (uicomponent_ != null)
+ {
+ UIComponent oldParent = uicomponent_.getParent();
+ if (oldParent != null && oldParent != this && oldParent instanceof UIComponentDecorator)
+ {
+ ((UIComponentDecorator)oldParent).setUIComponent(null);
+ }
uicomponent_.setParent(this);
+ }
return oldOne;
}
14 years, 1 month
gatein SVN: r5241 - portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-11-23 18:48:21 -0500 (Tue, 23 Nov 2010)
New Revision: 5241
Modified:
portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java
Log:
minor
Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java
===================================================================
--- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java 2010-11-23 21:41:56 UTC (rev 5240)
+++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/GroovyTemplate.java 2010-11-23 23:48:21 UTC (rev 5241)
@@ -34,6 +34,7 @@
public class GroovyTemplate
{
+ // todo : move that to {@link org.gatein.common.io.IOTools}
private static String read(Reader reader) throws IOException
{
StringBuilder builder = new StringBuilder();
14 years, 1 month