Author: taylor
Date: Tue Jun 10 22:37:00 2014
New Revision: 1601783
URL: http://svn.apache.org/r1601783
Log:
JS2-1292: Set Default Compiler for Jetspeed Build to Java 1.7
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/ApplicationEventMethodsInvoker.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/ApplicationEventMethodsInvoker.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/ApplicationEventMethodsInvoker.java?rev=1601783&r1=1601782&r2=1601783&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/ApplicationEventMethodsInvoker.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/ApplicationEventMethodsInvoker.java Tue Jun 10 22:37:00 2014
@@ -17,9 +17,6 @@
package org.apache.jetspeed.components;
-import java.util.List;
-import java.util.Map;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -30,6 +27,9 @@ import org.springframework.context.Appli
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.util.MethodInvoker;
+import java.util.List;
+import java.util.Map;
+
/**
* Utility callback method invoker bean
* which can be used to invoke custom callback methods
@@ -129,11 +129,16 @@ public class ApplicationEventMethodsInvo
{
for (Map.Entry<Class<? extends ApplicationEvent>, List<MethodInvoker>> entry : eventTypeMethodInvokersMap.entrySet())
{
- Class<? extends ApplicationEvent> eventType = entry.getKey();
-
- if (eventType.isAssignableFrom(event.getClass()))
- {
- return entry.getValue();
+ String className = entry.getKey().getName();
+ try {
+ //Class<? extends ApplicationEvent> eventType = entry.getKey();
+ Class eventClass = Class.forName(className);
+ if (eventClass.isAssignableFrom(event.getClass())) {
+ return entry.getValue();
+ }
+ }
+ catch (Exception e) {
+ log.error("Failed to load application event for given class: " + className);
}
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java?rev=1601783&r1=1601782&r2=1601783&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java Tue Jun 10 22:37:00 2014
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
*/
public class TomcatManager implements ApplicationServerManager
{
- private static final String DEFAULT_MANAGER_SCRIPT_PATH = "/manager";
+ private static final String DEFAULT_MANAGER_SCRIPT_PATH = "/manager/text";
protected static final Logger log = LoggerFactory.getLogger("deployment");
private String hostUrl;
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=1601783&r1=1601782&r2=1601783&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties Tue Jun 10 22:37:00 2014
@@ -176,8 +176,8 @@ autodeployment.apps.internal.path=${appl
application.server.host=localhost
application.server.port=8080
# Path to access the Tomcat manager, see: http://tomcat.apache.org/tomcat-6.0-doc/manager-howto.html
-# Note: For default Tomcat 7+ this should be adjusted to: /manager/script
-application.server.manager.script.path=/manager
+# Note: For default Tomcat 6- this should be adjusted to: /manager
+application.server.manager.script.path=/manager/text
# Tomcat user name/password having role "manager-script" for access to the Tomcat Manager
# By default these are undefined (disabled Tomcat Manager access)
application.server.manager.name=
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=1601783&r1=1601782&r2=1601783&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Tue Jun 10 22:37:00 2014
@@ -1584,8 +1584,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
<debug>true</debug>
<showDeprecation>false</showDeprecation>
<showWarnings>false</showWarnings>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.