pvollenweider 2005/10/12 11:19:13 CEST
Modified files:
core/src/scripts jahia.bat jahia.sh
. project.xml
Log:
Change SNAPSHOT version
Revision Changes Path
1.6 +1 -1 jahia/core/src/scripts/jahia.bat
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/scripts/jahia.bat.diff?r1=1.5&r2=1.6&f=h
1.6 +2 -2 jahia/core/src/scripts/jahia.sh
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/scripts/jahia.sh.diff?r1=1.5&r2=1.6&f=h
1.7 +3 -3 jahia/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/project.xml.diff?r1=1.6&r2=1.7&f=h
Index: jahia.bat
===================================================================
RCS file: /home/cvs/repository/jahia/core/src/scripts/jahia.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jahia.bat 16 Aug 2005 12:45:50 -0000 1.5
+++ jahia.bat 12 Oct 2005 09:19:13 -0000 1.6
@@ -35,7 +35,7 @@
:skipjikes
cd ..\bin
cd ..\tomcat\webapps\jahia
-java -classpath
"%CLASSPATH%;.\;.\WEB-INF\lib\jahia-4.5-SNAPSHOT.jar;.\WEB-INF\lib\log4j-1.2.8.jar"
org.jahia.init.TomcatWait
+java -classpath
"%CLASSPATH%;.\;.\WEB-INF\lib\jahia-5.0-SNAPSHOT.jar;.\WEB-INF\lib\log4j-1.2.8.jar"
org.jahia.init.TomcatWait
cd ..\..\..\bin
echo Starting browser...
start http://localhost:8080/jahia/html/startup/loadingjahia.html
Index: jahia.sh
===================================================================
RCS file: /home/cvs/repository/jahia/core/src/scripts/jahia.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jahia.sh 16 Aug 2005 12:45:50 -0000 1.5
+++ jahia.sh 12 Oct 2005 09:19:13 -0000 1.6
@@ -51,8 +51,8 @@
cd ../bin
echo Started. Waiting for browser startup...
cd ../tomcat/webapps/jahia
-#java -classpath
$CLASSPATH:./:./WEB-INF/lib/jahia-4.5-SNAPSHOT.jar:../../shared/lib/log4j-1.2.8.jar
org.jahia.init.TomcatWait
http://localhost:8080/jahia/html/startup/startjahia.html
-java -classpath
"$CLASSPATH:./:./WEB-INF/lib/jahia-4.5-SNAPSHOT.jar:./WEB-INF/lib/log4j-1.2.8.jar"
org.jahia.init.TomcatWait
+#java -classpath
$CLASSPATH:./:./WEB-INF/lib/jahia-5.0-SNAPSHOT.jar:../../shared/lib/log4j-1.2.8.jar
org.jahia.init.TomcatWait
http://localhost:8080/jahia/html/startup/startjahia.html
+java -classpath
"$CLASSPATH:./:./WEB-INF/lib/jahia-5.0-SNAPSHOT.jar:./WEB-INF/lib/log4j-1.2.8.jar"
org.jahia.init.TomcatWait
cd ../../../bin
MOZILLAPATH=`which mozilla`
if [ -x $MOZILLAPATH ] ; then
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/jahia/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 22 Jun 2005 18:43:33 -0000 1.6
+++ project.xml 12 Oct 2005 09:19:13 -0000 1.7
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
<!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
-]>
+]>
<project>
<extend>${basedir}/../common-jahiaprojects/project.xml</extend>
<pomVersion>3</pomVersion>
<artifactId>root-jahia</artifactId>
<name>Jahia CMS and Portal Server</name>
<groupId>jahia</groupId>
- <currentVersion>4.5-SNAPSHOT</currentVersion>
+ <currentVersion>5.0-SNAPSHOT</currentVersion>
<inceptionYear>1999</inceptionYear>
<package>org.jahia</package>
@@ -25,7 +25,7 @@
development; Integrated HTML cache engine; dynamic XML export
module and much more...</description>
<shortDescription>Jahia CMS and Portal Server</shortDescription>
-
+
&common-topsite;
&common-toprepository;
