shuber 2005/05/31 19:08:29 CEST
Modified files:
core/src/java/org/jahia/engines/shared Application_Field.java
core/src/webapp/WEB-INF/var/db hypersonic.script
Log:
Temp fix in order to get Jahia to start. Should be able to reuse JNDI
datasource though. Something is weird here.
Revision Changes Path
1.12 +8 -5
jahia/core/src/java/org/jahia/engines/shared/Application_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/Application_Field.java.diff?r1=1.11&r2=1.12&f=h
1.3 +2 -1 jahia/core/src/webapp/WEB-INF/var/db/hypersonic.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/hypersonic.script.diff?r1=1.2&r2=1.3&f=h
Index: Application_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/Application_Field.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Application_Field.java 5 Apr 2005 16:22:50 -0000 1.11
+++ Application_Field.java 31 May 2005 17:08:29 -0000 1.12
@@ -427,11 +427,14 @@
getEntryPointInstance(
entryPointInstanceID.intValue());
if (epInstance == null) {
- appBean = (ApplicationBean) authAppList.get(0);
- appID = appBean.getID();
- EntryPointDefinition epDef = (EntryPointDefinition) appBean.
-
getEntryPointDefinitions().get(0);
- selectedEntryPointDefName = epDef.getName();
+ if (authAppList.size() > 0) {
+ appBean = (ApplicationBean) authAppList.get(0);
+ appID = appBean.getID();
+ EntryPointDefinition epDef = (EntryPointDefinition)
appBean.
+
getEntryPointDefinitions().get(
+ 0);
+ selectedEntryPointDefName = epDef.getName();
+ }
} else {
selectedEntryPointDefName = epInstance.getDefName();
int separatorPos = selectedEntryPointDefName.indexOf("###");
Index: hypersonic.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/hypersonic.script,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hypersonic.script 2 Apr 2004 10:31:27 -0000 1.2
+++ hypersonic.script 31 May 2005 17:08:29 -0000 1.3
@@ -11,5 +11,6 @@
jahia.database.schemascriptdir = sql/schema/hypersonic
jahia.database.popuplationscriptdir = sql/population
jahia.database.starthsqlserver=true
-jahia.database.datasource = java:comp/env/jdbc/jetspeed
+#jahia.database.datasource = java:comp/env/jdbc/jetspeed
+jahia.database.datasource=
jahia.database.ojbplatform = Hsqldb
