Author: tdraier
Date: Fri Sep 14 13:24:09 2007
New Revision: 18479
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18479&repname=
=3Djahia
Log:
first version of automatic scripts applier (groovy patch applier only), add=
ed a tracker in the administration to check what has been installed (port 1=
8305)
Added:
trunk/core/src/java/org/jahia/admin/patches/
- copied from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/=
jahia/admin/patches/
trunk/core/src/java/org/jahia/admin/patches/ManagePatches.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/admin/patches/ManagePatches.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaInstalledPatchDAO.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/hibernate/dao/JahiaInstalledPatchDAO.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaVersionDAO.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/hibernate/dao/JahiaVersionDAO.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaInstalledPatchMana=
ger.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/hibernate/manager/JahiaInstalledPatchManager.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaVersionManager.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/hibernate/manager/JahiaVersionManager.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaInstalledPatch.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/hibernate/model/JahiaInstalledPatch.java
trunk/core/src/java/org/jahia/hibernate/model/JahiaVersion.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/hibernate/model/JahiaVersion.java
trunk/core/src/java/org/jahia/version/
- copied from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/=
jahia/version/
trunk/core/src/java/org/jahia/version/GroovyPatcher.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/version/GroovyPatcher.java
trunk/core/src/java/org/jahia/version/Patch.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/version/Patch.java
trunk/core/src/java/org/jahia/version/Patcher.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/version/Patcher.java
trunk/core/src/java/org/jahia/version/SqlPatcher.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/version/SqlPatcher.java
trunk/core/src/java/org/jahia/version/VersionService.java
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/java/org/jahia/version/VersionService.java
trunk/core/src/webapp/WEB-INF/etc/patches/
- copied from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WE=
B-INF/etc/patches/
trunk/core/src/webapp/jsp/jahia/administration/patch_init.jsp
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/jsp/jahia/administration/patch_init.jsp
trunk/core/src/webapp/jsp/jahia/administration/patch_list.jsp
- copied unchanged from r18305, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/jsp/jahia/administration/patch_list.jsp
Modified:
trunk/core/src/conf/java/JahiaAdministrationResources.properties
trunk/core/src/java/org/jahia/bin/Jahia.java
trunk/core/src/java/org/jahia/bin/JahiaAdministration.java
trunk/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.xml
trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.x=
ml
trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql
trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
.sql
Modified: trunk/core/src/conf/java/JahiaAdministrationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources.properties&rev=3D18479&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaAdministrationResources.properties (origi=
nal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources.properties Fri Se=
p 14 13:24:09 2007
@@ -1055,6 +1055,10 @@
org.jahia.admin.productionManager.form.error.required.targetSite =3D Targe=
t site must not be empty
org.jahia.admin.productionManager.form.error.required.username =3D Usernam=
e must not be empty
=
+org.jahia.admin.patchmanagement.label =3D Version tracker
+org.jahia.admin.patchmanagement.warning.label =3D It seems that your jahia=
is installed on a database previously created. In order for the version tr=
acker to work correctly, you'll have to provide the build number of your pr=
evious installation of jahia =
+org.jahia.admin.patchmanagement.enterBuildNumber.label =3D Enter your prev=
ious build number
+
org.jahia.admin.productionManager.error.SomeFieldsAreEmpty =3D Some fields=
are empty please check that you filled all fields before saving.
org.jahia.admin.productionManager.error.targetSite =3D target site must no=
t be empty;
org.jahia.admin.productionManager.error.profile =3D Invalid profile
Modified: trunk/core/src/java/org/jahia/bin/Jahia.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/Jahia.java&rev=3D18479&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/bin/Jahia.java (original)
+++ trunk/core/src/java/org/jahia/bin/Jahia.java Fri Sep 14 13:24:09 2007
@@ -76,6 +76,7 @@
import org.jahia.utils.*;
import org.jahia.utils.modifier.TomcatUsersModifier;
import org.jahia.utils.xml.betwixt.XmlReader;
+import org.jahia.version.VersionService;
import org.xml.sax.SAXException;
=
import javax.servlet.ServletConfig;
@@ -542,6 +543,8 @@
return;
}
=
+ VersionService.getInstance().jahiaInit();
+
mInitiated =3D true;
=
} // end init
Modified: trunk/core/src/java/org/jahia/bin/JahiaAdministration.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/JahiaAdministration.java&rev=3D18479&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/bin/JahiaAdministration.java (original)
+++ trunk/core/src/java/org/jahia/bin/JahiaAdministration.java Fri Sep 14 1=
3:24:09 2007
@@ -65,6 +65,7 @@
import org.jahia.admin.templates.ManageTemplates;
import org.jahia.admin.users.ManageGroups;
import org.jahia.admin.users.ManageUsers;
+import org.jahia.admin.patches.ManagePatches;
import org.jahia.data.JahiaData;
import org.jahia.exceptions.*;
import org.jahia.exceptions.services.ServiceNotFoundException;
@@ -161,7 +162,7 @@
* Default init inherited from HttpServlet. This method set config and
* context static variables.
*
- * @param config Servlet configuration (inherited).
+ * @param aConfig Servlet configuration (inherited).
*/
public void init( ServletConfig aConfig )
throws ServletException
@@ -437,6 +438,10 @@
// operation : display access statistics
new ManageStatistics(request, response, session);
// Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Arge=
ntina - added 07/04/2006 - End
+ } else if ("patches".equals(operation) &&
+ hasServerPermission("admin.patches.ManagePatch=
es", jParams)) {
+ session.setAttribute(CLASS_NAME + "configJahia", B=
oolean.TRUE);
+ new ManagePatches().execute(request, response);
} else if ("users".equals(operation) &&
hasSitePermission("admin.users.ManageUsers", j=
Params)) {
// operation : users management
Modified: trunk/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/JahiaConfigurationWizard.java&rev=3D18479&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java (origin=
al)
+++ trunk/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java Fri Sep=
14 13:24:09 2007
@@ -75,6 +75,7 @@
import java.net.URL;
import java.net.UnknownHostException;
import java.util.*;
+import java.sql.Timestamp;
=
=
/**
@@ -1680,6 +1681,15 @@
sqlRootUser.append("', 1)");
db.query(sqlRootUser.toString());
=
+ sqlRootUser.delete(0, sqlRootUser.length());
+ sqlRootUser.append("INSERT INTO jahia_version(install_number, buil=
d, release_number, install_date) VALUES(0, ");
+ sqlRootUser.append(new Integer(JahiaInterface.BUILD_NUMBER));
+ sqlRootUser.append(",'");
+ sqlRootUser.append(Jahia.RELEASE_NUMBER + "." + Jahia.PATCH_NUMBER=
);
+ sqlRootUser.append("','");
+ sqlRootUser.append(new Timestamp(System.currentTimeMillis()));
+ sqlRootUser.append("')");
+ db.query(sqlRootUser.toString());
}
// end insertDBCustomContent()
=
Modified: trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.x=
ml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/spring/applicationcontext-dao.xml&rev=3D18479&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.xml (or=
iginal)
+++ trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-dao.xml Fri=
Sep 14 13:24:09 2007
@@ -238,6 +238,18 @@
</property>
</bean>
=
+ <bean id=3D"jahiaVersionDAO" class=3D"org.jahia.hibernate.dao.JahiaVer=
sionDAO" parent=3D"abstractGeneratorDAO">
+ <property name=3D"sessionFactory">
+ <ref bean=3D"sessionFactory"/>
+ </property>
+ </bean>
+
+ <bean id=3D"jahiaInstalledPatchDAO" class=3D"org.jahia.hibernate.dao.J=
ahiaInstalledPatchDAO" parent=3D"abstractGeneratorDAO">
+ <property name=3D"sessionFactory">
+ <ref bean=3D"sessionFactory"/>
+ </property>
+ </bean>
+
<bean id=3D"idGeneratorDAO" class=3D"org.jahia.hibernate.dao.IDGenerat=
orDAO" init-method=3D"start" destroy-method=3D"stop">
<property name=3D"sessionFactory">
<ref bean=3D"sessionFactory"/>
@@ -364,6 +376,12 @@
<entry
key=3D"org.jahia.hibernate.model.JahiaStatistics">
<value>jahia_statistics.id_jahia_statistics</value>
</entry>
+ <entry key=3D"org.jahia.hibernate.model.JahiaVersion">
+ <value>jahia_version.install_number</value>
+ </entry>
+ <entry key=3D"org.jahia.hibernate.model.JahiaInstalled=
Patch">
+ <value>jahia_installedpatch.install_number</valu=
e>
+ </entry>
</map>
</property>
<property name=3D"simpleSequences">
Modified: trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hiber=
nate.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/spring/applicationcontext-hibernate.xml&rev=3D18479&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.x=
ml (original)
+++ trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-hibernate.x=
ml Fri Sep 14 13:24:09 2007
@@ -94,6 +94,8 @@
<value>org/jahia/hibernate/model/JahiaWorkflow.hbm.xml</va=
lue>
<value>org/jahia/hibernate/model/JahiaLanguagesStates.hbm.=
xml</value>
<value>org/jahia/hibernate/model/JahiaXRef.hbm.xml</value>
+ <value>org/jahia/hibernate/model/JahiaVersion.hbm.xml</val=
ue>
+ <value>org/jahia/hibernate/model/JahiaInstalledPatch.hbm.x=
ml</value>
<value>org/jahia/workflow/nstep/model/User.hbm.xml</value>
<value>org/jahia/workflow/nstep/model/Workflow.hbm.xml</va=
lue>
<value>org/jahia/workflow/nstep/model/WorkflowStep.hbm.xml=
</value>
Modified: trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-manag=
er.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/spring/applicationcontext-manager.xml&rev=3D18479&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml=
(original)
+++ trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-manager.xml=
Fri Sep 14 13:24:09 2007
@@ -648,6 +648,26 @@
</property>
</bean>
=
+ <bean id=3D"org.jahia.hibernate.manager.JahiaVersionManager" parent=3D=
"txProxyTemplate">
+ <property name=3D"target">
+ <bean class=3D"org.jahia.hibernate.manager.JahiaVersionManager=
">
+ <property name=3D"jahiaVersionDao">
+ <ref bean=3D"jahiaVersionDAO"/>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <bean id=3D"org.jahia.hibernate.manager.JahiaInstalledPatchManager" pa=
rent=3D"txProxyTemplate">
+ <property name=3D"target">
+ <bean class=3D"org.jahia.hibernate.manager.JahiaInstalledPatch=
Manager">
+ <property name=3D"jahiaInstalledPatchDao">
+ <ref bean=3D"jahiaInstalledPatchDAO"/>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
<!-- Nicol=C3=83=C2=A1s Charczewski - Neoris Argentina - added 07/04/2=
006 - begin -->
<bean id=3D"org.jahia.hibernate.manager.JahiaStatisticsManager" parent=
=3D"txProxyTemplate">
<property name=3D"target">
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-=
schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema.sql&rev=3D18479&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/hypersonic/jahia-schema=
.sql Fri Sep 14 13:24:09 2007
@@ -74,6 +74,7 @@
drop table jahia_homepages_prop if exists;
drop table jahia_indexingjobs if exists;
drop table jahia_indexingjobsserver if exists;
+drop table jahia_installedpatch if exists;
drop table jahia_languages_states if exists;
drop table jahia_link if exists;
drop table jahia_link_metadata if exists;
@@ -115,6 +116,7 @@
drop table jahia_statistics if exists;
drop table jahia_user_prop if exists;
drop table jahia_users if exists;
+drop table jahia_version if exists;
drop table jahia_workflow if exists;
create table jahia_acl (
id_jahia_acl integer not null,
@@ -369,6 +371,14 @@
indexing_date bigint,
primary key (serverid, indexingjobid)
);
+create table jahia_installedpatch (
+ install_number integer not null,
+ name varchar(100),
+ build integer,
+ result_code integer,
+ install_date timestamp,
+ primary key (install_number)
+);
create table jahia_languages_states (
objectkey varchar(40) not null,
language_code varchar(10) not null,
@@ -724,6 +734,13 @@
primary key (id_jahia_users),
unique (key_jahia_users)
);
+create table jahia_version (
+ install_number integer not null,
+ build integer,
+ release_number varchar(20),
+ install_date timestamp,
+ primary key (install_number)
+);
create table jahia_workflow (
OBJECTKEY varchar(255) not null,
MODEVALUE integer,
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schem=
a.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql&rev=3D18479&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql =
(original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mssql/jahia-schema.sql =
Fri Sep 14 13:24:09 2007
@@ -74,6 +74,7 @@
drop table jahia_homepages_prop;
drop table jahia_indexingjobs;
drop table jahia_indexingjobsserver;
+drop table jahia_installedpatch;
drop table jahia_languages_states;
drop table jahia_link;
drop table jahia_link_metadata;
@@ -115,6 +116,7 @@
drop table jahia_statistics;
drop table jahia_user_prop;
drop table jahia_users;
+drop table jahia_version;
drop table jahia_workflow;
create table jahia_acl (
id_jahia_acl int not null,
@@ -366,6 +368,14 @@
indexing_date numeric(19,0) null,
primary key (serverid, indexingjobid)
);
+create table jahia_installedpatch (
+ install_number int not null,
+ name nvarchar(100) null,
+ build int null,
+ result_code int null,
+ install_date datetime null,
+ primary key (install_number)
+);
create table jahia_languages_states (
objectkey nvarchar(40) not null,
language_code nvarchar(10) not null,
@@ -718,6 +728,13 @@
siteid_jahia_users int null,
primary key (id_jahia_users)
);
+create table jahia_version (
+ install_number int not null,
+ build int null,
+ release_number nvarchar(20) null,
+ install_date datetime null,
+ primary key (install_number)
+);
create table jahia_workflow (
OBJECTKEY nvarchar(255) not null,
MODEVALUE int null,
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schem=
a.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql&rev=3D18479&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql =
(original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/mysql/jahia-schema.sql =
Fri Sep 14 13:24:09 2007
@@ -74,6 +74,7 @@
drop table if exists jahia_homepages_prop;
drop table if exists jahia_indexingjobs;
drop table if exists jahia_indexingjobsserver;
+drop table if exists jahia_installedpatch;
drop table if exists jahia_languages_states;
drop table if exists jahia_link;
drop table if exists jahia_link_metadata;
@@ -115,6 +116,7 @@
drop table if exists jahia_statistics;
drop table if exists jahia_user_prop;
drop table if exists jahia_users;
+drop table if exists jahia_version;
drop table if exists jahia_workflow;
create table jahia_acl (
id_jahia_acl integer not null,
@@ -366,6 +368,14 @@
indexing_date bigint,
primary key (serverid, indexingjobid)
);
+create table jahia_installedpatch (
+ install_number integer not null,
+ name varchar(100),
+ build integer,
+ result_code integer,
+ install_date datetime,
+ primary key (install_number)
+);
create table jahia_languages_states (
objectkey varchar(40) not null,
language_code varchar(10) not null,
@@ -718,6 +728,13 @@
siteid_jahia_users integer,
primary key (id_jahia_users)
);
+create table jahia_version (
+ install_number integer not null,
+ build integer,
+ release_number varchar(20),
+ install_date datetime,
+ primary key (install_number)
+);
create table jahia_workflow (
OBJECTKEY varchar(255) not null,
MODEVALUE integer,
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-sche=
ma.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql&rev=3D18479&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql=
(original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/oracle/jahia-schema.sql=
Fri Sep 14 13:24:09 2007
@@ -30,6 +30,7 @@
drop table jahia_homepages_prop cascade constraints;
drop table jahia_indexingjobs cascade constraints;
drop table jahia_indexingjobsserver cascade constraints;
+drop table jahia_installedpatch cascade constraints;
drop table jahia_languages_states cascade constraints;
drop table jahia_link cascade constraints;
drop table jahia_link_metadata cascade constraints;
@@ -71,6 +72,7 @@
drop table jahia_statistics cascade constraints;
drop table jahia_user_prop cascade constraints;
drop table jahia_users cascade constraints;
+drop table jahia_version cascade constraints;
drop table jahia_workflow cascade constraints;
create table jahia_acl (
id_jahia_acl number(10,0) not null,
@@ -322,6 +324,14 @@
indexing_date number(19,0),
primary key (serverid, indexingjobid)
);
+create table jahia_installedpatch (
+ install_number number(10,0) not null,
+ name varchar2(100),
+ build number(10,0),
+ result_code number(10,0),
+ install_date timestamp,
+ primary key (install_number)
+);
create table jahia_languages_states (
objectkey varchar2(40) not null,
language_code varchar2(10) not null,
@@ -674,6 +684,13 @@
siteid_jahia_users number(10,0),
primary key (id_jahia_users)
);
+create table jahia_version (
+ install_number number(10,0) not null,
+ build number(10,0),
+ release_number varchar2(20),
+ install_date timestamp,
+ primary key (install_number)
+);
create table jahia_workflow (
OBJECTKEY varchar2(255) not null,
MODEVALUE number(10,0),
Modified: trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-=
schema.sql
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/var/db/sql/schema/postgresql/jahia-schema.sql&rev=3D18479&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
.sql (original)
+++ trunk/core/src/webapp/WEB-INF/var/db/sql/schema/postgresql/jahia-schema=
.sql Fri Sep 14 13:24:09 2007
@@ -74,6 +74,7 @@
drop table jahia_homepages_prop;
drop table jahia_indexingjobs;
drop table jahia_indexingjobsserver;
+drop table jahia_installedpatch;
drop table jahia_languages_states;
drop table jahia_link;
drop table jahia_link_metadata;
@@ -115,6 +116,7 @@
drop table jahia_statistics;
drop table jahia_user_prop;
drop table jahia_users;
+drop table jahia_version;
drop table jahia_workflow;
create table jahia_acl (
id_jahia_acl int4 not null,
@@ -366,6 +368,14 @@
indexing_date int8,
primary key (serverid, indexingjobid)
);
+create table jahia_installedpatch (
+ install_number int4 not null,
+ name varchar(100),
+ build int4,
+ result_code int4,
+ install_date timestamp,
+ primary key (install_number)
+);
create table jahia_languages_states (
objectkey varchar(40) not null,
language_code varchar(10) not null,
@@ -718,6 +728,13 @@
siteid_jahia_users int4,
primary key (id_jahia_users)
);
+create table jahia_version (
+ install_number int4 not null,
+ build int4,
+ release_number varchar(20),
+ install_date timestamp,
+ primary key (install_number)
+);
create table jahia_workflow (
OBJECTKEY varchar(255) not null,
MODEVALUE int4,
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
