shuber 2005/05/30 16:28:34 CEST
Modified files: (Branch: JAHIA-HIBERNATE-BRANCH)
core project.properties
core/src/webapp/jsp/jahia/templates/default addressList.jsp
core/src/webapp/jsp/test addressList.jsp declaration.jsp
. project.xml
Removed files: (Branch: JAHIA-HIBERNATE-BRANCH)
core/src/webapp/views/engines/versioning/pages restore.jsp
Log:
- Fixed JSP files broken by search/replace.
- Remove unused JSP file
- Updated project version to 4.5 as it should be.
Revision Changes Path
1.16.2.4 +0 -2 jahia/core/project.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.properties.diff?r1=1.16.2.3&r2=1.16.2.4&f=h
1.1.2.2 +2 -1
jahia/core/src/webapp/jsp/jahia/templates/default/addressList.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/templates/default/addressList.jsp.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.1.2.2 +2 -1 jahia/core/src/webapp/jsp/test/addressList.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/test/addressList.jsp.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.1.2.2 +2 -1 jahia/core/src/webapp/jsp/test/declaration.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/test/declaration.jsp.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.1.2.1 +0 -16
jahia/core/src/webapp/views/engines/versioning/pages/restore.jsp (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/restore.jsp?rev=1.1&content-type=text/plain
1.3.2.1 +1 -1 jahia/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/project.xml.diff?r1=1.3&r2=1.3.2.1&f=h
Index: project.properties
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.properties,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -u -r1.16.2.3 -r1.16.2.4
--- project.properties 26 May 2005 14:57:55 -0000 1.16.2.3
+++ project.properties 30 May 2005 14:28:33 -0000 1.16.2.4
@@ -1,5 +1,3 @@
-maven.repo.local=e:\\maven\\repository
-
# Display the date on the Maven web site
maven.xdoc.date = left
Index: addressList.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/templates/default/addressList.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- addressList.jsp 9 Feb 2005 10:40:45 -0000 1.1.2.1
+++ addressList.jsp 30 May 2005 14:28:33 -0000 1.1.2.2
@@ -31,7 +31,8 @@
<a href="<bean:write name='deleteContainerURL'/>">Delete
container</a>
</logic:present>
- <bean:define id="myContentContainer" name="myAddress"
property="jahiaContainercontent:viewLocksURL actionType="deleteContainer"
name="myContentContainer" display="false" id="myLockURL"/>
+ <bean:define id="myContentContainer" name="myAddress"
property="contentContainer" />
+ <content:viewLocksURL actionType="deleteContainer"
name="myContentContainer" display="false" id="myLockURL"/>
<logic:present name="myLockURL">
<a href="<bean:write name='myLockURL'/>">View/release locks</a>
</logic:present>
Index: addressList.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/test/addressList.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- addressList.jsp 9 Feb 2005 10:40:45 -0000 1.1.2.1
+++ addressList.jsp 30 May 2005 14:28:33 -0000 1.1.2.2
@@ -84,7 +84,8 @@
<br>
- <bean:define id="myContentContainer" name="myAddress"
property="jahiaContainercontent:viewLocksURL actionType="deleteContainer"
name="myContentContainer" display="false" id="myLockURL"/>
+ <bean:define id="myContentContainer" name="myAddress"
property="contentContainer" />
+ <content:viewLocksURL actionType="deleteContainer"
name="myContentContainer" display="false" id="myLockURL"/>
<logic:present name="myLockURL">
<a href="<bean:write name='myLockURL'/>">View/release locks</a>
</logic:present>
Index: declaration.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/test/declaration.jsp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- declaration.jsp 9 Feb 2005 10:40:45 -0000 1.1.2.1
+++ declaration.jsp 30 May 2005 14:28:33 -0000 1.1.2.2
@@ -31,7 +31,8 @@
<a href="<bean:write name='deleteContainerURL'/>">Delete
container</a>
</logic:present>
- <bean:define id="myContentContainer" name="myAddress"
property="jahiaContainercontent:viewLocksURL actionType="deleteContainer"
name="myContentContainer" display="false" id="myLockURL"/>
+ <bean:define id="myContentContainer" name="myAddress"
property="contentContainer" />
+ <content:viewLocksURL actionType="deleteContainer"
name="myContentContainer" display="false" id="myLockURL"/>
<logic:present name="myLockURL">
<a href="<bean:write name='myLockURL'/>">View/release locks</a>
</logic:present>
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/jahia/project.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- project.xml 24 Sep 2004 13:56:20 -0000 1.3
+++ project.xml 30 May 2005 14:28:34 -0000 1.3.2.1
@@ -8,7 +8,7 @@
<artifactId>root-jahia</artifactId>
<name>Jahia CMS and Portal Server</name>
<groupId>jahia</groupId>
- <currentVersion>4.1-SNAPSHOT</currentVersion>
+ <currentVersion>4.5-SNAPSHOT</currentVersion>
<inceptionYear>1999</inceptionYear>
<package>org.jahia</package>
