You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pr...@apache.org on 2007/12/04 18:17:25 UTC
svn commit: r601006 -
/geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
Author: prasad
Date: Tue Dec 4 09:17:07 2007
New Revision: 601006
URL: http://svn.apache.org/viewvc?rev=601006&view=rev
Log:
* don't need to load jetspeed.properties in System props
Modified:
geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
Modified: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java?rev=601006&r1=601005&r2=601006&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java Tue Dec 4 09:17:07 2007
@@ -97,14 +97,6 @@
System.out.println("APP ROOT is " + applicationPath);
System.setProperty(JetspeedEngineConstants.APPLICATION_ROOT_KEY, applicationPath);
System.setProperty("portal.name","jetspeed");
- Properties p = System.getProperties();
- try {
- p.load(new FileInputStream(new File(applicationPath, JetspeedEngineConstants.JETSPEED_PROPERTIES_DEFAULT)));
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- System.setProperties(p);
SpringJNDIStarter starter = new SpringJNDIStarter(context, applicationPath, bootConfigFiles, configFiles);