Changeset 214:ff8b1c2d5ef9

Show
Ignore:
Timestamp:
08/28/09 12:40:17 (4 years ago)
Author:
jean-gui
Branch:
default
convert_revision:
svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@215
Message:

Merging dev2 in HEAD

Files:
202 added
198 removed
5 modified

Legend:

Unmodified
Added
Removed

  • .classpath

    r213 r214  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<classpath> 
    3         <classpathentry excluding="lib/|buildsds/|conf/" kind="src" path=""/> 
     3        <classpathentry kind="src" path="src"/> 
     4        <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v6.0"/> 
     5        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/velocity-1.6.2.jar" sourcepath="E:/Unicorn/librairies/velocity-1.6.2/src/java"> 
     6                <attributes> 
     7                        <attribute name="javadoc_location" value="file:/E:/Unicorn/librairies/velocity-1.6.2/docs/api/"/> 
     8                </attributes> 
     9        </classpathentry> 
     10        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/log4j-1.2.15.jar" sourcepath="E:/Unicorn/librairies/apache-log4j-1.2.15/src/main/java"> 
     11                <attributes> 
     12                        <attribute name="javadoc_location" value="file:/E:/Unicorn/librairies/apache-log4j-1.2.15/src/main/javadoc/"/> 
     13                </attributes> 
     14        </classpathentry> 
     15        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/xbean.jar"/> 
     16        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpcore-4.0.1.jar"/> 
     17        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpmime-4.0.jar"/> 
     18        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/httpclient-4.0.jar"/> 
     19        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/apache-mime4j-0.6.jar"/> 
    420        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    5         <classpathentry kind="lib" path="lib/activation.jar"/> 
    6         <classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/> 
    7         <classpathentry kind="lib" path="lib/commons-fileupload-1.1.1.jar"/> 
    8         <classpathentry kind="lib" path="lib/commons-io-1.2.jar"/> 
    9         <classpathentry kind="lib" path="lib/commons-logging-1.1.jar"/> 
    10         <classpathentry kind="lib" path="lib/icu4j_3_4.jar"/> 
    11         <classpathentry kind="lib" path="lib/iri.jar"/> 
    12         <classpathentry kind="lib" path="lib/jena.jar"/> 
    13         <classpathentry kind="lib" path="lib/jsr173_1.0_api.jar"/> 
    14         <classpathentry kind="lib" path="lib/log4j-1.2.12.jar"/> 
    15         <classpathentry kind="lib" path="lib/servlet.jar"/> 
    16         <classpathentry kind="lib" path="lib/velocity-1.5-dev.jar"/> 
    17         <classpathentry kind="lib" path="lib/xercesImpl.jar"/> 
    18         <classpathentry kind="lib" path="lib/catalina-ant.jar"/> 
    19         <classpathentry kind="lib" path="lib/observationresponse.jar"/> 
    20         <classpathentry kind="lib" path="lib/tasklist.jar"/> 
    21         <classpathentry kind="lib" path="lib/xbean_xpath.jar"/> 
    22         <classpathentry kind="lib" path="lib/xbean.jar"/> 
    23         <classpathentry kind="lib" path="lib/xmlbeans-qname.jar"/> 
    24         <classpathentry kind="output" path="build"/> 
     21        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/jsr173_1.0_api.jar"/> 
     22        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-collections-3.2.1.jar"/> 
     23        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-lang-2.4.jar"/> 
     24        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/activation.jar"/> 
     25        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.1.1.jar"/> 
     26        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-io-1.2.jar"/> 
     27        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/icu4j_3_4.jar"/> 
     28        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/iri.jar"/> 
     29        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/jena.jar"/> 
     30        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/observationresponse.jar"/> 
     31        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/resolver.jar"/> 
     32        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-dom.jar"/> 
     33        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-jdom.jar"/> 
     34        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-sql.jar"/> 
     35        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-xom.jar"/> 
     36        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8-xpath.jar"/> 
     37        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/saxon8.jar"/> 
     38        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/servlet.jar"/> 
     39        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/xbean_xpath.jar"/> 
     40        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/xercesImpl.jar"/> 
     41        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlbeans-qname.jar"/> 
     42        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/xmlpublic.jar"/> 
     43        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-logging-1.1.1.jar"/> 
     44        <classpathentry kind="lib" path="WebContent/WEB-INF/lib/tasklist.jar"/> 
     45        <classpathentry kind="output" path="build/classes"/> 
    2546</classpath> 

  • .project

    r1 r214  
    22<projectDescription> 
    33        <name>unicorn</name> 
    4         <comment>@key 32303036303332302D3130303020756E69636F726E2F6A65616E </comment> 
     4        <comment></comment> 
    55        <projects> 
    66        </projects> 
    77        <buildSpec> 
     8                <buildCommand> 
     9                        <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> 
     10                        <arguments> 
     11                        </arguments> 
     12                </buildCommand> 
    813                <buildCommand> 
    914                        <name>org.eclipse.jdt.core.javabuilder</name> 
    … …  
    1217                </buildCommand> 
    1318                <buildCommand> 
    14                         <name>com.omondo.uml.std.Builder</name> 
     19                        <name>org.eclipse.wst.common.project.facet.core.builder</name> 
     20                        <arguments> 
     21                        </arguments> 
     22                </buildCommand> 
     23                <buildCommand> 
     24                        <name>org.eclipse.wst.validation.validationbuilder</name> 
    1525                        <arguments> 
    1626                        </arguments> 
    … …  
    1828        </buildSpec> 
    1929        <natures> 
     30                <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> 
     31                <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> 
     32                <nature>org.eclipse.wst.common.project.facet.core.nature</nature> 
    2033                <nature>org.eclipse.jdt.core.javanature</nature> 
    21                 <nature>com.omondo.uml.std.Nature</nature> 
     34                <nature>org.eclipse.wst.jsdt.core.jsNature</nature> 
    2235        </natures> 
    2336</projectDescription> 

  • .settings/org.eclipse.core.resources.prefs

    r212 r214  
    1 #Thu Jul 30 11:53:38 GMT+02:00 2009 
    2 encoding//resources/templates/language/index.it.properties=UTF-8 
     1#Wed Aug 19 12:52:14 CEST 2009 
    32eclipse.preferences.version=1 
    4 encoding//resources/templates/language/index.en.properties=UTF-8 
    5 encoding//resources/templates/language/index.fr.properties=UTF-8 
    6 encoding//resources/templates/language/general.fr.properties=UTF-8 
    7 encoding//resources/templates/language/general.en.properties=UTF-8 
     3encoding//WebContent/WEB-INF/languages/en.properties=UTF-8 
     4encoding//WebContent/WEB-INF/languages/fr.properties=UTF-8 
     5encoding/<project>=UTF-8 

  • .settings/org.eclipse.jdt.core.prefs

    r1 r214  
    1 #Mon May 22 13:46:28 CEST 2006 
     1#Wed Aug 05 12:14:02 CEST 2009 
    22eclipse.preferences.version=1 
     3org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 
    34org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 
     5org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve 
    46org.eclipse.jdt.core.compiler.compliance=1.5 
     7org.eclipse.jdt.core.compiler.debug.lineNumber=generate 
     8org.eclipse.jdt.core.compiler.debug.localVariable=generate 
     9org.eclipse.jdt.core.compiler.debug.sourceFile=generate 
    510org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 
    611org.eclipse.jdt.core.compiler.problem.enumIdentifier=error 

  • build.xml

    r195 r214  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    2 <project name="unicorn" default="build" basedir="."> 
    3   <property name="unicorn.location" value="."/> 
    4    
    5   <property name="app.name" value="unicorn"/> 
    6   <property name="jar.file" value="${app.name}.jar"/> 
    7   <property name="war.file" value="${app.name}.war"/> 
    8    
    9   <!-- Configure properties to access the Manager application --> 
    10   <property name="url"      value="http://flyingman.sophia.w3.org:8180/manager"/> 
    11         <property name="username" value="manager"/> 
    12         <property name="password" value="******"/> 
     1<?xml version="1.0" ?> 
     2<project name="" basedir="."> 
     3        <property name="warfile" value="unicorn"/> 
     4        <property name="webapps" value="."/> 
     5        <property name="src" location="src"/> 
     6        <property name="build" location="build"/> 
     7        <property name="dist" location="dist"/> 
    138         
    14     <path id="project.classpath"> 
    15       <pathelement location="."/> 
    16       <pathelement location="${unicorn.location}/lib/activation.jar"/> 
    17       <pathelement location="${unicorn.location}/lib/commons-collections-3.1.jar"/> 
    18       <pathelement location="${unicorn.location}/lib/commons-fileupload-1.1.1.jar"/> 
    19       <pathelement location="${unicorn.location}/lib/commons-io-1.2.jar"/> 
    20       <pathelement location="${unicorn.location}/lib/commons-logging-1.1.jar"/> 
    21       <pathelement location="${unicorn.location}/lib/icu4j_3_4.jar"/> 
    22       <pathelement location="${unicorn.location}/lib/iri.jar"/> 
    23       <pathelement location="${unicorn.location}/lib/jena.jar"/> 
    24       <pathelement location="${unicorn.location}/lib/jsr173_1.0_api.jar"/> 
    25       <pathelement location="${unicorn.location}/lib/log4j-1.2.12.jar"/> 
    26       <pathelement location="${unicorn.location}/lib/servlet.jar"/> 
    27       <pathelement location="${unicorn.location}/lib/velocity-1.5-dev.jar"/> 
    28       <pathelement location="${unicorn.location}/lib/xercesImpl.jar"/> 
    29         <pathelement location="${unicorn.location}/lib/catalina-ant.jar"/> 
    30         <pathelement location="${unicorn.location}/lib/observationresponse.jar"/> 
    31         <pathelement location="${unicorn.location}/lib/tasklist.jar"/> 
    32         <pathelement location="${unicorn.location}/lib/xbean.jar"/> 
    33         <pathelement location="${unicorn.location}/lib/xbean_xpath.jar"/> 
    34         <pathelement location="${unicorn.location}/lib/xmlbeans-qname.jar"/> 
    35         <pathelement location="${unicorn.location}/lib/xmlpublic.jar"/> 
    36         <pathelement location="${unicorn.location}/lib/saxon8.jar"/> 
    37         <pathelement location="${unicorn.location}/lib/saxon8-dom.jar"/> 
    38         <pathelement location="${unicorn.location}/lib/saxon8-jdom.jar"/> 
    39         <pathelement location="${unicorn.location}/lib/saxon8-xpath.jar"/> 
    40     </path> 
     9        <target name="all" depends="war, jigsaw, jar"/> 
    4110         
    42     <!-- Configure the custom Ant tasks for the Manager application --> 
    43     <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="deploy" classname="org.apache.catalina.ant.DeployTask"/> 
    44     <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="list"      classname="org.apache.catalina.ant.ListTask"/> 
    45     <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="reload"    classname="org.apache.catalina.ant.ReloadTask"/> 
    46     <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="resources" classname="org.apache.catalina.ant.ResourcesTask"/> 
    47     <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="roles"     classname="org.apache.catalina.ant.RolesTask"/> 
    48     <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="start"     classname="org.apache.catalina.ant.StartTask"/> 
    49     <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="stop"      classname="org.apache.catalina.ant.StopTask"/> 
    50     <taskdef classpath="${unicorn.location}/lib/catalina-ant.jar" name="undeploy"  classname="org.apache.catalina.ant.UndeployTask"/>    
     11        <target name="war" depends="compile" description="Generate unicorn.war"> 
     12                <mkdir dir="${dist}"/> 
     13                <war destfile="${dist}/${warfile}.war" webxml="WebContent/WEB-INF/web.xml" update="true"> 
     14                        <classes dir="build\classes"/> 
     15                        <fileset dir="WebContent"> 
     16                                <exclude name="WEB-INF/web.xml"/> 
     17                        </fileset> 
     18                </war> 
     19        </target> 
    5120         
    52     <target name="init"> 
    53         <mkdir dir="build"/> 
    54     </target> 
    55     <target name="clean"> 
    56         <delete dir="build"/> 
    57     </target> 
    58     <target name="build" depends="init"> 
    59         <echo message="${ant.project.name}: ${ant.file}"/> 
    60         <javac destdir="build" debug="on" debuglevel="lines,vars,source"> 
    61             <src path="."/> 
    62             <exclude name="lib/"/> 
    63             <classpath refid="project.classpath"/> 
     21        <target name="jigsaw" depends="compile" description="Generate folder for Jigsaw" > 
     22                <mkdir dir="${dist}/jigsaw"/> 
     23                <copy todir="${dist}/jigsaw" overwrite="true"> 
     24                        <fileset dir="WebContent"/> 
     25                </copy> 
     26                <copy todir="${dist}/jigsaw/WEB-INF" overwrite="true"> 
     27                        <fileset dir="${build}"/> 
     28                </copy> 
     29        </target> 
     30         
     31        <target name="jar" depends="compile" description="Generate unicorn.jar" > 
     32                <mkdir dir="${dist}"/> 
     33                <jar jarfile="${dist}/unicorn.jar" basedir="${build}"/> 
     34        </target> 
     35 
     36        <target name="clean" description="clean up" > 
     37                <delete dir="${build}/classes"/> 
     38                <delete dir="${dist}"/> 
     39        </target> 
     40         
     41        <target name="compile"> 
     42                <mkdir dir="${build}/classes"/> 
     43                <javac srcdir="${src}" destdir="${build}/classes" debug="on" debuglevel="lines,vars,source"> 
     44                        <classpath> 
     45                                <fileset dir="WebContent/WEB-INF/lib" includes="*.jar"/> 
     46                        </classpath> 
    6447        </javac> 
    65     </target> 
    66     <target name="jigsaw"> 
    67         <echo message="${ant.project.name}: ${ant.file}"/> 
    68         <javac destdir="." debug="on" debuglevel="lines,vars,source"> 
    69             <src path="."/> 
    70             <exclude name="lib/"/> 
    71             <classpath refid="project.classpath"/> 
    72         </javac> 
    73         <copy file="./org/w3c/unicorn/conf/log4j_Jigsaw.xml" 
    74               tofile="./log4j.xml" 
    75               overwrite="true"/> 
    76     </target> 
    77     <target name="index"> 
    78         <java fork="yes" classname="org.w3c.unicorn.index.IndexGenerator" failonerror="true"> 
    79             <classpath refid="project.classpath"/> 
    80         </java> 
    81     </target> 
    82  
    83     <target name="help"> 
    84       <echo message="Please run: $ ant -v -projecthelp"/> 
    85     </target> 
    86      
    87     <target name="copyConfiguration"  depends="build" description="Workspace configuration"> 
    88       <copy file="./org/w3c/unicorn/conf/unicorn.properties" 
    89             tofile="./build/org/w3c/unicorn/conf/unicorn.properties" 
    90             overwrite="true"/> 
    91       <copy file="./org/w3c/unicorn/conf/log4j_Tomcat.xml" 
    92             tofile="./build/log4j.xml" 
    93             overwrite="true"/> 
    94       <copy file="./org/w3c/unicorn/conf/extensions.properties" 
    95             tofile="./build/org/w3c/unicorn/conf/extensions.properties"  
    96             overwrite="true"/> 
    97       <copy file="./org/w3c/unicorn/conf/responseParsers.properties" 
    98             tofile="./build/org/w3c/unicorn/conf/responseParsers.properties"  
    99             overwrite="true"/> 
    100       <copy file="./org/w3c/unicorn/conf/specialFormaters.properties"  
    101             tofile="./build/org/w3c/unicorn/conf/specialFormaters.properties" 
    102             overwrite="true"/> 
    103       <copy file="./org/w3c/unicorn/conf/velocity.properties"  
    104             tofile="./build/org/w3c/unicorn/conf/velocity.properties" 
    105             overwrite="true"/> 
    106     </target> 
    107      
    108     <target name="make-war" depends="build" description="Creates the webapp module"> 
    109       <delete file="${war.file}"/> 
    110       <war warfile="${war.file}" webxml="web.xml" basedir="." excludes="*,**"> 
    111         <classes dir="build"> 
    112           <include name="org/**"/> 
    113         </classes> 
    114         <classes dir="."> 
    115           <exclude name="build/**"/> 
    116           <include name="build/**/*.properties"/> 
    117         </classes> 
    118         <classes file="./build/log4j.xml"/> 
    119         <webinf dir="."> 
    120           <include name="uploaded-files/**"/> 
    121           <include name="logs/**"/> 
    122         </webinf> 
    123         <lib dir="lib"/> 
    124         <zipfileset dir="images" prefix="images"/> 
    125         <zipfileset dir="style" prefix="style"/> 
    126         <zipfileset dir="resources" prefix="WEB-INF/resources"/> 
    127         <zipfileset dir="tabtastic" prefix="tabtastic"/> 
    128         <zipfileset dir="temporary_files" prefix="temporary_files"/> 
    129       </war> 
    130     </target> 
    131      
    132     <target name="war" depends="copyConfiguration,make-war" /> 
    133      
    134     <target name="jar" depends="build" description="Creates the unicorn library"> 
    135       <delete file="${jar.file}" /> 
    136       <jar destfile="${jar.file}"> 
    137         <fileset dir="build"> 
    138           <include name="org/**/*.class" /> 
    139           <include name="**/*.properties" /> 
    140           <include name="log4j.xml" /> 
    141         </fileset> 
    142         <fileset dir="."> 
    143           <include name="org/**/*.java" /> 
    144         </fileset> 
    145       </jar> 
    146     </target> 
    147      
    148     <target name="deploy" description="Install web application" depends="war"> 
    149       <deploy url="${url}" username="${username}" password="${password}" path="/unicorn" 
    150               war="unicorn.war"/> 
    151     </target> 
    152      
    153     <target name="reload" description="Reload web application"> 
    154       <reload  url="${url}" username="${username}" password="${password}" path="/unicorn"/> 
    155     </target> 
    156      
    157     <target name="undeploy" description="Remove web application"> 
    158       <undeploy url="${url}" username="${username}" password="${password}" path="/unicorn"/> 
    159     </target>       
    160      
    161  
    162     <!-- Local tests --> 
    163  
    164     <target name="CallParameter"> 
    165         <java fork="yes" classname="org.w3c.unicorn.contract.methods.CallParameter" failonerror="true"> 
    166             <classpath refid="project.classpath"/> 
    167         </java> 
    168     </target> 
    169     <target name="DigesterDriver"> 
    170         <java fork="yes" classname="bordel.DigesterDriver" failonerror="true"> 
    171             <classpath refid="project.classpath"/> 
    172         </java> 
    173     </target> 
    174     <target name="WADLUnmarshallerXPath"> 
    175         <java fork="yes" classname="org.w3c.unicorn.contract.wadl.WADLUnmarshallerXPath" failonerror="true"> 
    176             <classpath refid="project.classpath"/> 
    177         </java> 
    178     </target> 
    179     <target name="TaskListUnmarshallerBeans"> 
    180         <java fork="yes" classname="org.w3c.unicorn.tasklist.TaskListUnmarshallerBeans" failonerror="true"> 
    181             <classpath refid="project.classpath"/> 
    182         </java> 
    183     </target> 
    184     <target name="ListFiles"> 
    185         <java fork="yes" classname="org.w3c.unicorn.util.ListFiles" failonerror="true"> 
    186             <classpath refid="project.classpath"/> 
    187         </java> 
    188     </target> 
    189  
     48        </target> 
     49         
     50        <target name="deploy" depends="war"> 
     51                <copy todir="${webapps}" overwrite="true"> 
     52                        <fileset dir="."> 
     53                                <include name="${dist}/unicorn.war"/> 
     54                        </fileset> 
     55                </copy> 
     56        </target> 
     57         
     58        <target name="xsd"> 
     59                <xmlbean schema="WebContent/WEB-INF/resources/schemas/tasklist.xsd" destfile="WebContent/WEB-INF/lib/tasklist.jar" javasource="1.5" classpath="WebContent/WEB-INF/lib/xbean.jar"/> 
     60                <xmlbean schema="WebContent/WEB-INF/resources/schemas/observer-response.xsd" destfile="WebContent/WEB-INF/lib/observationresponse.jar" javasource="1.5" classpath="WebContent/WEB-INF/lib/xbean.jar"/> 
     61        </target> 
     62         
     63        <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpath="WebContent/WEB-INF/lib/xbean.jar"/> 
     64         
    19065</project>