shuber 2004/09/24 15:25:19 CEST
Modified files:
core maven.xml
core/src/webapp/jsp/jahia/engines/shared
readonly_page_field.jsp
core/src/webapp/jsp/jahia/engines/workflow adv_workflow.jsp
workflow.jsp
core/src/webapp/views/engines/versioning/pages
restore_version_test_result.jsp
. maven.xml
Removed files:
core/src/webapp/jsp/jahia/engines/include coremetadata.jsp
core/src/webapp/jsp/jahia/engines/metadata coremetadata.jsp
core/src/webapp/views/engines/metadata metadata.jsp
Log:
Updating build procedure to use our packaging plugin :
!!! WARNING !!! : you must follow build procedures indicated here
http://projects.jahia.org/building.html to properly build Jahia or any of the webapps.
Revision Changes Path
1.21 +1 -149 jahia/core/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/maven.xml.diff?r1=1.20&r2=1.21&f=h
1.3 +0 -30
jahia/core/src/webapp/jsp/jahia/engines/include/coremetadata.jsp (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/include/coremetadata.jsp?rev=1.2&content-type=text/plain
1.3 +0 -184
jahia/core/src/webapp/jsp/jahia/engines/metadata/coremetadata.jsp (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/metadata/coremetadata.jsp?rev=1.2&content-type=text/plain
1.4 +2 -2
jahia/core/src/webapp/jsp/jahia/engines/shared/readonly_page_field.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/shared/readonly_page_field.jsp.diff?r1=1.3&r2=1.4&f=h
1.5 +1 -0
jahia/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp.diff?r1=1.4&r2=1.5&f=h
1.4 +1 -0 jahia/core/src/webapp/jsp/jahia/engines/workflow/workflow.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/workflow/workflow.jsp.diff?r1=1.3&r2=1.4&f=h
1.3 +0 -298 jahia/core/src/webapp/views/engines/metadata/metadata.jsp (dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/metadata/metadata.jsp?rev=1.2&content-type=text/plain
1.2 +2 -2
jahia/core/src/webapp/views/engines/versioning/pages/restore_version_test_result.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/views/engines/versioning/pages/restore_version_test_result.jsp.diff?r1=1.1&r2=1.2&f=h
1.3 +3 -5 jahia/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/maven.xml.diff?r1=1.2&r2=1.3&f=h
Index: maven.xml
===================================================================
RCS file: /cvs/jahia/core/maven.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- maven.xml 12 Aug 2004 15:43:41 -0000 1.20
+++ maven.xml 24 Sep 2004 13:25:17 -0000 1.21
@@ -1,4 +1,4 @@
-<project default="war"
+<project default="jahia:war"
xmlns:j="jelly:core"
xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
@@ -56,152 +56,4 @@
<copy file="./lib/jetspeed2/jetspeed-api-2.0-a1-dev.jar"
todir="${catalina.shared.lib}"/>
</goal>
- <preGoal name="war:webapp">
- <j:set var="precompileJsp" value="${precompile.jsp}"/>
- <j:if test="${precompileJsp == 'true'}">
- <attainGoal name="precompile-jsp"/>
- </j:if>
- </preGoal>
-
- <postGoal name="war:webapp">
- <j:set var="precompileJsp" value="${precompile.jsp}"/>
- <j:if test="${precompileJsp == 'true'}">
- <j:set var="target"
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webapp.dir')}"/>
- <util:available file="${maven.build.dir}/web-fragment.xml">
- <util:loadText var="fragment" file="${maven.build.dir}/web-fragment.xml"/>
- <ant:replace file="${target}/WEB-INF/web.xml" token="<!-- [INSERT
FRAGMENT HERE] -->" value="${fragment}"/>
- </util:available>
- </j:if>
- </postGoal>
-
- <goal name="precompile-jsp" description="Precompile all JSPs into java classes,
and then into classes" prereqs="war:load,java:compile">
- <j:set var="warSource"
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.src')}"/>
- <ant:mkdir dir="${maven.build.dir}/jspc"/>
- <ant:mkdir dir="${maven.build.dir}/jspc-processed"/>
- <ant:mkdir dir="${maven.build.dir}/jspc-classes"/>
-
- <j:set var="jspOutDir" value="${maven.build.dir}/jspc"/>
- <j:set var="jspClassesOutDir" value="${maven.build.dest}"/>
- <ant:path id="jspc.classpath">
- <ant:fileset dir="${tomcat.home}/bin">
- <ant:include name="*.jar"/>
- </ant:fileset>
- <ant:fileset dir="${tomcat.home}/server/lib">
- <ant:include name="*.jar"/>
- </ant:fileset>
- <ant:fileset dir="${tomcat.home}/common/lib">
- <ant:include name="*.jar"/>
- </ant:fileset>
- <!--
- <ant:pathelement location="${tomcat.home}/common/lib/jasper-runtime.jar"/>
- <ant:pathelement location="${tomcat.home}/common/lib/jasper-compiler.jar"/>
- <ant:pathelement location="${tomcat.home}/common/lib/servlet.jar"/>
- <ant:pathelement location="${tomcat.home}/common/lib/jsp-api.jar"/>
- <ant:pathelement location="${tomcat.home}/common/lib/servlet-api.jar"/>
- -->
- <ant:path refid="maven.dependency.classpath"/>
- <ant:pathelement path="${maven.build.dest}"/>
- </ant:path>
- <ant:taskdef name="jasper2" classname="org.apache.jasper.JspC"
classpathref="jspc.classpath"/>
- <ant:jasper2
- webXmlFragment="${maven.build.dir}/web-fragment.xml"
- package="${pom.package}.jsp.${pom.artifactId}"
- outputDir="${jspOutDir}"
- srcdir="${warSource}"
- uriroot="${warSource}"
- uribase="/${pom.artifactId}"
- verbose="2"/>
- <ant:javac
- srcdir="${jspOutDir}"
- destdir="${jspClassesOutDir}"
- debug="${maven.compile.debug}"
- deprecation="${maven.compile.deprecation}"
- optimize="${maven.compile.optimize}"
- classpathref="jspc.classpath"/>
- </goal>
-
- <goal name="update:jetspeed2"
- description="Updates Jahia with Jetspeed 2 source files. Requires
successful compilation of Jetspeed 2 first.">
- <echo>Copying from ${jetspeed2.src.dir}...</echo>
-
- <!-- Copy the demo application -->
- <echo>Copying the DEMO war application from
${maven.repo.local}/jetspeed2/wars/demo-2.0-a1-dev.war</echo>
- <copy file="${maven.repo.local}/jetspeed2/wars/demo-2.0-a1-dev.war"
tofile="./src/webapp/WEB-INF/var/shared_components/demo.war"/>
-
- <!-- Copy generated database schema creation scripts -->
- <echo>Copying generated database scripts</echo>
- <copy todir="./src/webapp/WEB-INF/var/db/sql/schema/hypersonic">
- <fileset dir="${jetspeed2.src.dir}/target/src/sql/hsql">
- <include name="**/*.sql"/>
- <exclude name="**/*test*"/>
- <exclude name="**/*demo*"/>
- </fileset>
- </copy>
- <copy todir="./src/webapp/WEB-INF/var/db/sql/schema/mysql">
- <fileset dir="${jetspeed2.src.dir}/target/src/sql/mysql">
- <include name="**/*.sql"/>
- <exclude name="**/*test*"/>
- <exclude name="**/*demo*"/>
- </fileset>
- </copy>
- <copy todir="./src/webapp/WEB-INF/var/db/sql/schema/oracle">
- <fileset dir="${jetspeed2.src.dir}/target/src/sql/oracle">
- <include name="**/*.sql"/>
- <exclude name="**/*test*"/>
- <exclude name="**/*demo*"/>
- </fileset>
- </copy>
-
- <!-- Ideally we would like to patch some of these files after copying them...
-->
-
- <!-- Copy the jetspeed.properties file (usually we will not need to do this -->
- <!--copy
file="${jetspeed2.src.dir}/portal/src/webapp/WEB-INF/conf/jetspeed.properties"
todir="./src/webapp/WEB-INF/etc/jetspeed/conf"/-->
-
- <!-- Copy the assembly file -->
- <!--copy
file="${jetspeed2.src.dir}/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy"
todir="./src/webapp/WEB-INF/etc/jetspeed/conf"/-->
-
- <!-- Copy the pipeline configuration files -->
- <echo>Copying pipeline configuration files</echo>
- <copy
file="${jetspeed2.src.dir}/portal/src/webapp/WEB-INF/conf/pipelines/action-pipeline.xml"
todir="./src/webapp/WEB-INF/etc/jetspeed/conf/pipelines"/>
- <copy
file="${jetspeed2.src.dir}/portal/src/webapp/WEB-INF/conf/pipelines/portlet-pipeline.xml"
todir="./src/webapp/WEB-INF/etc/jetspeed/conf/pipelines"/>
-
- </goal>
-
- <preGoal name="war:war">
- <j:set var="mavenWarJarClasses" value="${maven.war.jarclasses}"/>
- <j:set var="mavenWarJarClassesJustClasses"
value="${maven.war.jarclasses.justclasses}"/>
- <j:set var="mavenWarJarClassesName" value="${maven.war.jarclasses.name}"/>
- <j:if test="${mavenWarJarClasses == 'true'}" trim="true">
- <j:choose>
-
- <j:when test="${mavenWarJarClassesJustClasses == 'true'}" trim="true">
- <jar
destfile="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib/${mavenWarJarClassesName}"
- basedir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
- includes="**/*.class"
- />
- <!-- we do all this mess because the delete includeEmptyDirs doesn't seem
to work in Ant :( -->
- <copy includeEmptyDirs="false"
toDir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources">
- <fileset dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes">
- <exclude name="**/*.class"/>
- </fileset>
- </copy>
- <delete dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes" />
- <move todir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes">
- <fileset
dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes_justresources"/>
- </move>
- </j:when>
-
- <j:otherwise>
- <jar
destfile="${maven.build.dir}/${pom.artifactId}/WEB-INF/lib/${mavenWarJarClassesName}"
- basedir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes"
- includes="**/*"
- />
- <delete dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes" />
- <mkdir dir="${maven.build.dir}/${pom.artifactId}/WEB-INF/classes" />
- </j:otherwise>
-
- </j:choose>
- </j:if>
- </preGoal>
-
</project>
Index: readonly_page_field.jsp
===================================================================
RCS file:
/cvs/jahia/core/src/webapp/jsp/jahia/engines/shared/readonly_page_field.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- readonly_page_field.jsp 6 Aug 2004 19:39:41 -0000 1.3
+++ readonly_page_field.jsp 24 Sep 2004 13:25:18 -0000 1.4
@@ -24,10 +24,10 @@
JahiaField theField = (JahiaField) engineMap.get(
fieldsEditCallingEngineName + "." + "theField" );
JahiaPageEngineTempBean thePage = (JahiaPageEngineTempBean)
session.getAttribute( "PageBean"+ theField.getID() );
- String languageCode =
(String)engineMap.get(JahiaEngine.PROCESSING_LANGUAGECODE);
+ Locale processingLocale = (Locale)engineMap.get(JahiaEngine.PROCESSING_LOCALE);
String pageTitle = "";
if ( thePage != null )
- pageTitle = thePage.getTitle(languageCode);
+ pageTitle = thePage.getTitle(processingLocale.toString());
if ( "".equals(pageTitle) )
pageTitle = "No title";
Index: adv_workflow.jsp
===================================================================
RCS file: /cvs/jahia/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- adv_workflow.jsp 8 Sep 2004 11:46:43 -0000 1.4
+++ adv_workflow.jsp 24 Sep 2004 13:25:18 -0000 1.5
@@ -1,5 +1,6 @@
<%@ page language="java" %>
<%@ page import="java.util.*,
+ java.io.*,
org.jahia.engines.workflow.WorkflowHelper,
org.jahia.engines.workflow.WorkflowHelperLanguageEntry,
org.jahia.services.workflow.WorkflowService,
Index: workflow.jsp
===================================================================
RCS file: /cvs/jahia/core/src/webapp/jsp/jahia/engines/workflow/workflow.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workflow.jsp 8 Sep 2004 11:46:43 -0000 1.3
+++ workflow.jsp 24 Sep 2004 13:25:18 -0000 1.4
@@ -1,5 +1,6 @@
<%@ page language="java" %>
<%@ page import="java.util.*" %>
+<%@ page import="java.io.*" %>
<%@ page import="org.jahia.content.*" %>
<%@ page import="org.jahia.data.*" %>
<%@ page import="org.jahia.data.fields.*" %>
Index: restore_version_test_result.jsp
===================================================================
RCS file:
/cvs/jahia/core/src/webapp/views/engines/versioning/pages/restore_version_test_result.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- restore_version_test_result.jsp 30 Mar 2004 14:16:27 -0000 1.1
+++ restore_version_test_result.jsp 24 Sep 2004 13:25:18 -0000 1.2
@@ -140,7 +140,7 @@
<%
ContentObject contentObject = (ContentObject)
JahiaObject.getInstance(testResult.getNodeKey());
String contentTitle = "No Title";
- ContentDefinition definition =
ContentDefinition.getInstance(contentObject.getDefinitionKey(loadRequest));
+ ContentDefinition definition = (ContentDefinition)
ContentDefinition.getInstance(contentObject.getDefinitionKey(loadRequest));
if ( definition != null ){
contentTitle =
definition.getTitle(contentObject,revisionEntry.getEntryState());
}
@@ -191,7 +191,7 @@
<%
ContentObject contentObject = (ContentObject)
JahiaObject.getInstance(testResult.getNodeKey());
String contentTitle = "No Title";
- ContentDefinition definition =
ContentDefinition.getInstance(contentObject.getDefinitionKey(loadRequest));
+ ContentDefinition definition = (ContentDefinition)
ContentDefinition.getInstance(contentObject.getDefinitionKey(loadRequest));
if ( definition != null ){
contentTitle =
definition.getTitle(contentObject,revisionEntry.getEntryState());
}
Index: maven.xml
===================================================================
RCS file: /cvs/jahia/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 28 Jul 2004 17:33:02 -0000 1.2
+++ maven.xml 24 Sep 2004 13:25:18 -0000 1.3
@@ -17,22 +17,20 @@
<maven:reactor
basedir="${basedir}/core"
includes="project.xml"
- goals="war"
+ goals="jahia:war"
banner="Builds Jahia WAR application"
postProcessing="false"
ignoreFailures="false"/>
</goal>
- <goal name="allClean"
- description="Clean all subprojects"
- >
+ <postGoal name="clean">
<maven:reactor
basedir="${basedir}"
includes="patched-slide/project.xml,core/project.xml"
goals="clean"
banner="Cleaning all sub projects"
ignoreFailures="true"/>
- </goal>
+ </postGoal>
</project>
