tdraier 2005/11/30 15:53:07 CET
Modified files:
src/conf
SenseiAdministrationResources_fr.properties
src/java/org/sensei/servlet/action/forms
ConfigurationForm.java
src/java/org/sensei/servlet/action ConfigurationAction.java
src/java/org/sensei/session SessionService.java
src/webapp/jsp/sensei wizardDb.jsp
Log:
fixed jdbc access
Revision Changes Path
1.8 +1 -1
sensei/src/conf/SenseiAdministrationResources_fr.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/conf/SenseiAdministrationResources_fr.properties.diff?r1=1.7&r2=1.8&f=h
1.15 +1 -1
sensei/src/java/org/sensei/servlet/action/ConfigurationAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/java/org/sensei/servlet/action/ConfigurationAction.java.diff?r1=1.14&r2=1.15&f=h
1.10 +0 -0
sensei/src/java/org/sensei/servlet/action/forms/ConfigurationForm.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/java/org/sensei/servlet/action/forms/ConfigurationForm.java.diff?r1=1.9&r2=1.10&f=h
1.12 +3 -1 sensei/src/java/org/sensei/session/SessionService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/java/org/sensei/session/SessionService.java.diff?r1=1.11&r2=1.12&f=h
1.8 +1 -1 sensei/src/webapp/jsp/sensei/wizardDb.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/sensei/src/webapp/jsp/sensei/wizardDb.jsp.diff?r1=1.7&r2=1.8&f=h
Index: SenseiAdministrationResources_fr.properties
===================================================================
RCS file:
/home/cvs/repository/sensei/src/conf/SenseiAdministrationResources_fr.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SenseiAdministrationResources_fr.properties 30 Nov 2005 12:20:56
-0000 1.7
+++ SenseiAdministrationResources_fr.properties 30 Nov 2005 14:53:06
-0000 1.8
@@ -35,7 +35,7 @@
link.viewProcess
= Voir l'instance du process
link.connectService
= Connecter un service
error.db = Sensei n'arrive
pas à se connecter à la base de données
-error.smtp = Serveur mail
innacessible
+error.smtp = Serveur mail
inacessible
error.passwd.notset = Vous devez
indiquer un mot de passe
error.passwd.mismatched = Le mot de passe
n'est pas valable
error.url.required = Une url valide est
nécessaire
Index: ConfigurationAction.java
===================================================================
RCS file:
/home/cvs/repository/sensei/src/java/org/sensei/servlet/action/ConfigurationAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ConfigurationAction.java 25 Nov 2005 16:08:44 -0000 1.14
+++ ConfigurationAction.java 30 Nov 2005 14:53:06 -0000 1.15
@@ -241,7 +241,7 @@
props.put("javax.jdo.PersistenceManagerFactoryClass",
"com.triactive.jdo.PersistenceManagerFactoryImpl");
- if ("datasource".equals(form.getDbType())) {
+ if (!"datasource".equals(form.getDbType())) {
props.put("javax.jdo.option.ConnectionURL", form.getDbUrl());
props.put("javax.jdo.option.ConnectionDriverName",
form.getDbDriver());
props.put("javax.jdo.option.ConnectionUserName",
form.getDbUser());
Index: SessionService.java
===================================================================
RCS file:
/home/cvs/repository/sensei/src/java/org/sensei/session/SessionService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SessionService.java 25 Nov 2005 16:08:45 -0000 1.11
+++ SessionService.java 30 Nov 2005 14:53:07 -0000 1.12
@@ -56,9 +56,10 @@
propertyStream.close();
GenericObjectPool connectionPool = new GenericObjectPool();
- PersistenceManagerFactory pmf =
JDOHelper.getPersistenceManagerFactory(jdoProperties);
+ PersistenceManagerFactory pmf;
if
(jdoProperties.getProperty("javax.jdo.option.ConnectionFactoryName")!=null) {
+ pmf = JDOHelper.getPersistenceManagerFactory(jdoProperties);
String name =
jdoProperties.getProperty("javax.jdo.option.ConnectionFactoryName");
// creating a default context
InitialContext initCtx = new InitialContext();
@@ -89,6 +90,7 @@
connectionPool.setFactory(poolableConnectionFactory);
connectionPool.setTestOnBorrow(true);
PoolingDataSource dataSource = new
PoolingDataSource(connectionPool);
+ pmf = JDOHelper.getPersistenceManagerFactory(jdoProperties);
pmf.setConnectionFactory(dataSource);
}
Index: wizardDb.jsp
===================================================================
RCS file: /home/cvs/repository/sensei/src/webapp/jsp/sensei/wizardDb.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wizardDb.jsp 30 Nov 2005 12:20:57 -0000 1.7
+++ wizardDb.jsp 30 Nov 2005 14:53:07 -0000 1.8
@@ -63,7 +63,7 @@
</tr>
<tr>
- <td width="100%" height="2" colspan="2"><img src="images/hr.gif"
width="300" height="2"></td>
+ <td width="100%" height="2" colspan="2"><img src="images/hr.gif"
width="300" height="2"/></td>
</tr>
<tr>
