Update of /var/cvs/speeltuin/ernst/vpro-wizards
In directory james.mmbase.org:/tmp/cvs-serv14495/applications/vpro-wizards

Modified Files:
        web.fragment.xml build.xml readme.txt build.properties.default 
Added Files:
        .cvsignore 
Log Message:
work in progress


See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards


.cvsignore is new



Index: web.fragment.xml
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/web.fragment.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- web.fragment.xml    2 Jun 2008 17:10:48 -0000       1.1
+++ web.fragment.xml    9 Jun 2008 18:29:49 -0000       1.2
@@ -9,13 +9,15 @@
     -->
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>
-            
classpath:/org/mmbase/applications/vpro-wizards/spring/applicationContext.xml
-            
classpath:/org/mmbase/applications/vpro-wizards/spring/vpro-wizards-servlet.xml
-        </param-value>
+        
<param-value>classpath:/org/mmbase/applications/vpro-wizards/spring/applicationContext.xml</param-value>
     </context-param>
 
     <listener>
+        
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+    </listener>
+
+
+    <listener>
         <listener-class>
             org.springframework.web.context.ContextLoaderListener
         </listener-class>
@@ -23,18 +25,26 @@
 
 
     <!-- The Spring editors servlet. -->
+
     <servlet>
         <servlet-name>vpro-wizards</servlet-name>
         <servlet-class>
             org.springframework.web.servlet.DispatcherServlet
         </servlet-class>
-        <load-on-startup>25</load-on-startup>
+        <init-param>
+              <param-name>contextConfigLocation</param-name>
+              
<param-value>org.springframework.web.context.vpro-wizards-servlet.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
 
     <!-- mapping for spring editors -->
+
     <servlet-mapping>
         <servlet-name>vpro-wizards</servlet-name>
         <url-pattern>/wizard/*</url-pattern>
     </servlet-mapping>
 
+
+
 </web-app>
\ No newline at end of file


Index: build.xml
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build.xml   2 Jun 2008 17:13:05 -0000       1.1
+++ build.xml   9 Jun 2008 18:29:49 -0000       1.2
@@ -12,11 +12,16 @@
   <import file="../buildbase-include.xml" />
   <property file="build.properties.default" />
 
+  <!--** create the jar **-->
   <target name="jar" description="Create the vpro-wizards jar"
     depends="vpro-wizards.jars,project.manifest,buildbase.jar" />
 
-   <target name="vpro-wizards.jars" description="Get the vpro-wizards 
dependencies">
+    <target name="init" depends="buildbase.init">
+        <available property="xerces.available"           
file="${project.build.dir}/${xerces.file.noversion}"/>
+    </target>
 
+    <!--** get the dependencies **-->
+    <target name="vpro-wizards.jars" description="Get the vpro-wizards 
dependencies">
     <!--spring-->
     <echo message="download spring" />
     <antcall target="downloadzip">
@@ -55,6 +60,9 @@
     </antcall>
     <copy file="${download.dir}/${nekohtml.file}" todir="${project.jar.dir}" 
preservelastmodified="true" />
 
+        <!--xerces: if not present yet. we rename this one, so we don't get 
twoo versions when mmbase has one too. this is a hack :-(-->
+        <antcall target="download.xerces"/>
+
     <!--oscache-->
     <echo message="download oscache" />
     <antcall target="download">
@@ -64,7 +72,21 @@
     <copy file="${download.dir}/${oscache.file}" todir="${project.jar.dir}" 
preservelastmodified="true" />
   </target>
 
+  <!--** download.xerces **-->
+  <target name="download.xerces" unless="xerces.available" depends="init">
+      <echo message="download xerces" />
+      <antcall target="download">
+          <param name="sourcefile" value="${xerces.loc}"/>
+          <param name="destfile" value="${download.dir}/${xerces.file}"/>
+      </antcall>
+      <!--rename to generic name (no version)-->
+      <move file="${download.dir}/${xerces.file}" 
tofile="${download.dir}/${xerces.file.noversion}"/>
+      <copy file="${download.dir}/${xerces.file.noversion}" 
todir="${project.jar.dir}" preservelastmodified="true" />
+  </target>
+
+  <!--** test **-->
   <target name="test" depends="init">
+        <echo message="build.dir: ${build.dir}"/>
     <echo message="webapp.dir: ${webapp.dir}"/>
     <echo message="templates.dir: ${templates.dir}"/>
     <echo message="templates.available: ${templates.available}"/>


Index: readme.txt
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/readme.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- readme.txt  2 Jun 2008 17:25:46 -0000       1.3
+++ readme.txt  9 Jun 2008 18:29:49 -0000       1.4
@@ -1,11 +1,12 @@
 todo:
 
 Y   zorg dat de vpro wizards compileren in de mmbase build.
-N   zorg dat de hele applicatie goed installeert met de build.
+Y   pas mmbase buildbase.properties aan: install.tagfiles
+Y   zorg dat de hele applicatie goed installeert met de build.
+N   maak een test beheer omgeving die samen werkt met een van de demo 
applicaties (news), zodat je kunt testen).
 N   pas de paden aan van de edit jsp's en de tags.
 N   refactor de java code
 N   pas de documentatie aan
-N   pas mmbase buildbase.properties aan: install.tagfiles
 N   zorg dat de fck richtext editor wordt gedownlaod, en niet in de cvs zit.
 N   zorg dat de build een war file kan bouwen met alle resources erin.
 


Index: build.properties.default
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/build.properties.default,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build.properties.default    2 Jun 2008 17:13:05 -0000       1.1
+++ build.properties.default    9 Jun 2008 18:29:49 -0000       1.2
@@ -22,12 +22,13 @@
 nekohtml.file=nekohtml-0.7.7.jar
 nekohtml.loc=${mmbase.maven.repository}/nekohtml/jars/${nekohtml.file}
 
+xerces.file=xercesImpl-2.8.0.jar
+xerces.file.noversion=xercesImpl.jar
+xerces.loc=${mmbase.maven.repository}/xerces/jars/${xerces.file}
+
 oscache.file=oscache-2.4.1.jar
 oscache.loc=${mmbase.maven.repository}/opensymphony/jars/${oscache.file}
 
 ### some compiler options ###
 
-nowarn=on;
-deprecation=on;
-
 
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to