You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2012/08/22 22:54:24 UTC

svn commit: r1376232 - in /archiva/trunk/archiva-modules: archiva-base/archiva-configuration/src/main/mdo/configuration.mdo archiva-base/archiva-model/src/main/mdo/archiva-base.xml archiva-web/archiva-webapp-js/pom.xml

Author: skygo
Date: Wed Aug 22 20:54:23 2012
New Revision: 1376232

URL: http://svn.apache.org/viewvc?rev=1376232&view=rev
Log:
remove some deprecation in mdo file and antrun target

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
    archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1376232&r1=1376231&r2=1376232&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Wed Aug 22 20:54:23 2012
@@ -42,7 +42,7 @@
           <required>true</required>
           <description>This is the version of the configuration format.</description>
         </field>
-        <field java.adder="false">
+        <field>
           <description>
  @deprecated use managedRepositories or remoteRepositories instead.
           </description>
@@ -50,8 +50,7 @@
           <version>1.0.0+</version>
           <association java.generate-add="false"
                        java.generate-remove="false"
-                       java.generate-break="false"
-                       java.generate-create="false">
+                       java.adder="false">
             <type>V1RepositoryConfiguration</type>
             <multiplicity>*</multiplicity>
           </association>

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?rev=1376232&r1=1376231&r2=1376232&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml Wed Aug 22 20:54:23 2012
@@ -19,7 +19,7 @@
   -->
 
 <model xsd.namespace="http://archiva.apache.org/model/1.2.0"
-       xsd.target-namespace="http://archiva.apache.org/model/1.2.0">
+       xsd.targetNamespace="http://archiva.apache.org/model/1.2.0">
   <id>archiva-base-model</id>
   <name>ArchivaBaseModel</name>
   <!-- Note that we've outright removed old model information instead of setting the finish version to be 1.2.1.

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1376232&r1=1376231&r2=1376232&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Wed Aug 22 20:54:23 2012
@@ -933,9 +933,9 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="${project.build.directory}/appserver-base/conf"/>
-              </tasks>
+              </target>
             </configuration>
           </execution>
         </executions>