Author: michiel Date: 2009-11-20 15:14:05 +0100 (Fri, 20 Nov 2009) New Revision: 39827
Added: mmbase/trunk/applications/vpro-wizards/Makefile mmbase/trunk/applications/vpro-wizards/src/main/webapp/mmbase/vpro-wizards/system/javascript/fckeditor/ Removed: mmbase/trunk/applications/vpro-wizards/antsupport-fck.xml mmbase/trunk/applications/vpro-wizards/ext/ mmbase/trunk/applications/vpro-wizards/src/main/webapp/mmbase/vpro-wizards/system/javascript/jquery/ Modified: mmbase/trunk/applications/vpro-wizards/ mmbase/trunk/applications/vpro-wizards/pom.xml mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/form/richtextfield.tag mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/form/wizard.tag mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/related/wizard.tag mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/web.fragment.xml Log: cleaned up a bit, removed jquery (can taken from overlay). Also create overlay for fckeditor, which eliminates the annotying download every build. Property changes on: mmbase/trunk/applications/vpro-wizards ___________________________________________________________________ Name: svn:ignore - build target .classpath .project .settings + build fbuild target .classpath .project .settings Added: mmbase/trunk/applications/vpro-wizards/Makefile =================================================================== --- mmbase/trunk/applications/vpro-wizards/Makefile (rev 0) +++ mmbase/trunk/applications/vpro-wizards/Makefile 2009-11-20 14:14:05 UTC (rev 39827) @@ -0,0 +1,52 @@ +version=3.0.1 +subversion=0 + +fversion=2.6.5 +fsubversion=0 + +zip=ckeditor_$(version).tar.gz +fzip=FCKeditor_$(fversion).tar.gz + +.PHONY: clean + + + + +ckeditor.war: $(zip) + mkdir -p build/mmbase/ + tar zxf $(zip) -C build/mmbase + jar cf $@ -C build/ . + +fckeditor.war: $(fzip) + mkdir -p fbuild/mmbase/ + tar zxf $(fzip) -C fbuild/mmbase + jar cf $@ -C fbuild/ . + +$(zip): + wget http://download.cksource.com/CKEditor/CKEditor/CKEditor%20$(version)/$(zip); + +$(fzip): + wget http://downloads.sourceforge.net/project/fckeditor/FCKeditor/$(fversion)/FCKeditor_$(fversion).tar.gz?use_mirror=garr + +deploy: ckeditor.war + mvn deploy:deploy-file \ + -DgeneratePom.description='CKEditor' -DgroupId=org.mmbase.ckeditor -DartifactId=ckeditor \ + -Dversion=$(version)-$(subversion) -Dpackaging=war \ + -Dfile=ckeditor.war \ + -Durl=scp://mmbase.org/home/mmweb/web/maven2 -DrepositoryId=mmbase + + +fdeploy: fckeditor.war + mvn deploy:deploy-file \ + -DgeneratePom.description='FCKEditor' -DgroupId=org.mmbase.ckeditor -DartifactId=fckeditor \ + -Dversion=$(fversion)-$(fsubversion) -Dpackaging=war \ + -Dfile=fckeditor.war \ + -Durl=scp://mmbase.org/home/mmweb/web/maven2 -DrepositoryId=mmbase + + +clean: + rm -rf build + rm -rf fbuild + rm -rf ckeditor.war + rm -rf fckeditor.war + Deleted: mmbase/trunk/applications/vpro-wizards/antsupport-fck.xml =================================================================== --- mmbase/trunk/applications/vpro-wizards/antsupport-fck.xml 2009-11-20 13:36:28 UTC (rev 39826) +++ mmbase/trunk/applications/vpro-wizards/antsupport-fck.xml 2009-11-20 14:14:05 UTC (rev 39827) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="vpro-wizards-integration" basedir="."> - - <!-- - Deze task moet worden aangeroepen met de volgende properties: - remote.download.url wat te downloaden? - webapp.dir De directory waarin de webapp wordt gebouwd, en waar de vpro-wizards dus worden ingevoegd. - version De versie die moet worden gedownload. bijv: 1.9.SNAPSHOT - remote.dir URL naar de directory waaruit het archief moet worden gedownload - --> - - - <target name="init"> - <property name="local.download.dir" value="${basedir}/target/download"/> - <property name="expand.dir" value="${local.download.dir}/expand"/> - <mkdir dir="${local.download.dir}"/> - <mkdir dir="${expand.dir}"/> - </target> - - <target name="test"> - <echo>local file: ${local.file}</echo> - <echo>webapp.dir: ${webapp.dir}</echo> - <echo>expand.dir: ${expand.dir}</echo> - <echo>basedir: ${basedir}</echo> - <echo>war.webapp.dir: ${war.webapp.dir}</echo> - <echo>expand.dir: ${expand.dir}</echo> - </target> - - <target name="doit" depends="init,download,expand,deploy"> - - </target> - - <target name="download" depends="check.download" unless="download.done"> - <echo>Downloading ...</echo> - <get src="${remote.download.url}" dest="${local.download.dir}/${local.file}"/> - </target> - - <target name="check.download"> - <available file="${local.download.dir}/${local.file}" property="download.done" value="true"/> - <echo>Check download flag: ${download.done}</echo> - </target> - - <target name="expand"> - <unzip src="${local.download.dir}/${local.file}" dest="${expand.dir}"/> - </target> - - <target name="deploy"> - <copy todir="${basedir}/target/${webapp.dir}/${deploy.destination}"> - <fileset dir="${expand.dir}/${deploy.sources}"/> - </copy> - </target> - -</project> \ No newline at end of file Modified: mmbase/trunk/applications/vpro-wizards/pom.xml =================================================================== --- mmbase/trunk/applications/vpro-wizards/pom.xml 2009-11-20 13:36:28 UTC (rev 39826) +++ mmbase/trunk/applications/vpro-wizards/pom.xml 2009-11-20 14:14:05 UTC (rev 39827) @@ -11,7 +11,6 @@ <artifactId>mmbase-vpro-wizards</artifactId> <name>MMBase VPRO Wizards</name> <packaging>war</packaging> - <version>${mmbase.version}</version> <properties> @@ -97,49 +96,19 @@ <artifactId>collections-generic</artifactId> <version>4.01</version> </dependency> + + + <dependency> + <groupId>org.mmbase.ckeditor</groupId> + <artifactId>fckeditor</artifactId> + <version>2.6.5-0</version> + <type>war</type> + </dependency> </dependencies> <build> <plugins> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <!-- - MM: I propose we simply wrap fck editors in an overlay and put in on mmbase.org/maven2 - - weird to have to assign this action to phase 'test'. but - prepare-package (the more logical phase) is not available in - older versions of maven, and the war:war task is bound to the - lifecycle first, so you can not get before that - --> - <phase>generate-sources</phase> - <configuration> - <tasks name="merge the fck editors with this project"> - <property name="webapp.dir" value="${pom.artifactId}-${pom.version}" /> - <property name="remote.download.url" - value="http://surfnet.dl.sourceforge.net/sourceforge/fckeditor/FCKeditor_2.6.4.zip"; /> - <property name="local.file" value="fckeditor.zip" /> - <property name="deploy.sources" value="fckeditor" /> - <property name="deploy.destination" - value="mmbase/vpro-wizards/system/javascript/fckeditor" /> - - <ant antfile="${basedir}/antsupport-fck.xml" inheritRefs="true"> - <target name="doit" /> - </ant> - - <copy file="${basedir}/ext/fckconfig.js" - todir="${basedir}/target/${webapp.dir}/mmbase/vpro-wizards/system/javascript/fckeditor" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> Modified: mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/form/richtextfield.tag =================================================================== --- mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/form/richtextfield.tag 2009-11-20 13:36:28 UTC (rev 39826) +++ mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/form/richtextfield.tag 2009-11-20 14:14:05 UTC (rev 39827) @@ -41,7 +41,8 @@ <script type="text/javascript"> var oFCKeditor = new FCKeditor( 'field_${nodetype}_${field}' ) ; - oFCKeditor.BasePath = '${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/fckeditor/'; + oFCKeditor.Config["CustomConfigurationsPath"] = "${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/fckeditor/fckconfig.js"; + oFCKeditor.BasePath = '${pageContext.request.contextPath}/mmbase/fckeditor/'; oFCKeditor.Config['ToolbarStartExpanded'] = true ; <%-- TODO deze check eruit halen --%> <c:choose> Modified: mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/form/wizard.tag =================================================================== --- mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/form/wizard.tag 2009-11-20 13:36:28 UTC (rev 39826) +++ mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/form/wizard.tag 2009-11-20 14:14:05 UTC (rev 39827) @@ -56,7 +56,7 @@ <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/javascript.js"></script> <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/calendar/calendar.js" ></script> <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/calendar/clock.js" ></script> - <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/ckeditor/ckeditor.js"></script> + <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/fckeditor/fckeditor.js"></script> <jsp:invoke fragment="header"/> </head> <body> Modified: mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/related/wizard.tag =================================================================== --- mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/related/wizard.tag 2009-11-20 13:36:28 UTC (rev 39826) +++ mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/tags/vpro-wizards/related/wizard.tag 2009-11-20 14:14:05 UTC (rev 39827) @@ -73,8 +73,8 @@ <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/javascript.js"></script> <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/calendar/calendar.js" ></script> <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/calendar/clock.js" ></script> - <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/fckeditor/fckeditor.js"></script> - <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/vpro-wizards/system/javascript/jquery/jquery.js"></script> + <script type="text/javascript" src="${pageContext.request.contextPath}/mmbase/fckeditor/fckeditor.js"></script> + <jsp:directive.include file="/mmbase/jquery/jquery.jspx" /> <jsp:invoke fragment="header"/> </head> <body class="related"> Modified: mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/web.fragment.xml =================================================================== --- mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/web.fragment.xml 2009-11-20 13:36:28 UTC (rev 39826) +++ mmbase/trunk/applications/vpro-wizards/src/main/webapp/WEB-INF/web.fragment.xml 2009-11-20 14:14:05 UTC (rev 39827) @@ -15,8 +15,8 @@ <listener> <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class> </listener> - - <listener> + + <listener> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> </listener> @@ -42,4 +42,4 @@ -</web-app> \ No newline at end of file +</web-app> Copied: mmbase/trunk/applications/vpro-wizards/src/main/webapp/mmbase/vpro-wizards/system/javascript/fckeditor (from rev 39526, mmbase/trunk/applications/vpro-wizards/ext) _______________________________________________ Cvs mailing list [email protected] http://lists.mmbase.org/mailman/listinfo/cvs
