use more conventionnal .mdo file name

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1311349 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/redback-users/redback-users-providers/redback-users-jdo/pom.xml b/redback-users/redback-users-providers/redback-users-jdo/pom.xml
index d42bdd82300aaf7c8113d22d50a8976a3b66c62c..8dc4f990d9e3c91d735092349692fd3c00396884 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-jdo/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-jdo/pom.xml
@@ -107,7 +107,7 @@
         <configuration>
           <version>1.0.1</version>
           <packageWithVersion>false</packageWithVersion>
-          <model>src/main/mdo/user.xml</model>
+          <model>src/main/mdo/user.mdo</model>
         </configuration>
         <executions>
           <execution>

diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo b/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
new file mode 100644 (file)
index 0000000..d1a97bf
--- /dev/null
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<model>
+  <id>redback-users-jdo</id>
+  <name>UsersManagement</name>
+  <version>1.0.1</version>
+  <description>Plexus Redback Users object model.</description>
+  <defaults>
+    <default>
+      <key>package</key>
+      <value>org.codehaus.plexus.redback.users.jdo</value>
+    </default>
+  </defaults>
+
+  <classes>
+    <class stash.storable="false" rootElement="true">
+      <name>UserDatabase</name>
+      <version>1.0.1+</version>
+      <fields>
+        <field>
+          <name>users</name>
+          <version>1.0.1+</version>
+          <association>
+            <type>JdoUser</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+    <class stash.storable="true" jpox.use-identifiers-as-primary-key="false">
+      <name>JdoUser</name>
+      <version>1.0.0+</version>
+      <interfaces>
+        <interface>org.apache.archiva.redback.users.User</interface>
+      </interfaces>
+      <description></description>
+      <fields>
+        <field jpox.primary-key="true" jpox.value-strategy="off" jpox.persistence-modifier="persistent">
+          <name>username</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field jpox.column="USER_PASSWORD">
+          <name>password</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>encodedPassword</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>fullName</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>email</name>
+          <version>1.0.0+</version>
+          <type>String</type>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>lastPasswordChange</name>
+          <version>1.0.0+</version>
+          <type>Date</type>
+        </field>
+        <field>
+          <name>lastLoginDate</name>
+          <version>1.0.0+</version>
+          <type>Date</type>
+        </field>
+        <field>
+          <name>countFailedLoginAttempts</name>
+          <version>1.0.0+</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>locked</name>
+          <version>1.0.0+</version>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>permanent</name>
+          <version>1.0.0+</version>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>validated</name>
+          <version>1.0.0+</version>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>passwordChangeRequired</name>
+          <version>1.0.0+</version>
+          <type>boolean</type>
+          <defaultValue>false</defaultValue>
+          <identifier>true</identifier>
+        </field>
+        <field>
+          <name>previousEncodedPasswords</name>
+          <version>1.0.0+</version>
+          <association stash.part="true">
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>accountCreationDate</name>
+          <version>1.0.0+</version>
+          <type>Date</type>
+        </field>
+      </fields>
+      <codeSegments>
+        <codeSegment>
+          <version>1.0.0+</version>
+          <code><![CDATA[
+              public JdoUser()
+              {
+                 // Intentionally initialize List to avoid JPOX NullPointerException Issues.
+                previousEncodedPasswords = new java.util.ArrayList();
+              }
+
+              public Object getPrincipal()
+              {
+                 return username;
+              }
+          ]]></code>
+        </codeSegment>
+      </codeSegments>
+    </class>
+  </classes>
+</model>

diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.xml b/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.xml
deleted file mode 100644 (file)
index d1a97bf..0000000
--- a/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<model>
-  <id>redback-users-jdo</id>
-  <name>UsersManagement</name>
-  <version>1.0.1</version>
-  <description>Plexus Redback Users object model.</description>
-  <defaults>
-    <default>
-      <key>package</key>
-      <value>org.codehaus.plexus.redback.users.jdo</value>
-    </default>
-  </defaults>
-
-  <classes>
-    <class stash.storable="false" rootElement="true">
-      <name>UserDatabase</name>
-      <version>1.0.1+</version>
-      <fields>
-        <field>
-          <name>users</name>
-          <version>1.0.1+</version>
-          <association>
-            <type>JdoUser</type>
-            <multiplicity>*</multiplicity>
-          </association>
-        </field>
-      </fields>
-    </class>
-    <class stash.storable="true" jpox.use-identifiers-as-primary-key="false">
-      <name>JdoUser</name>
-      <version>1.0.0+</version>
-      <interfaces>
-        <interface>org.apache.archiva.redback.users.User</interface>
-      </interfaces>
-      <description></description>
-      <fields>
-        <field jpox.primary-key="true" jpox.value-strategy="off" jpox.persistence-modifier="persistent">
-          <name>username</name>
-          <version>1.0.0+</version>
-          <type>String</type>
-          <identifier>true</identifier>
-        </field>
-        <field jpox.column="USER_PASSWORD">
-          <name>password</name>
-          <version>1.0.0+</version>
-          <type>String</type>
-          <identifier>true</identifier>
-        </field>
-        <field>
-          <name>encodedPassword</name>
-          <version>1.0.0+</version>
-          <type>String</type>
-          <identifier>true</identifier>
-        </field>
-        <field>
-          <name>fullName</name>
-          <version>1.0.0+</version>
-          <type>String</type>
-          <identifier>true</identifier>
-        </field>
-        <field>
-          <name>email</name>
-          <version>1.0.0+</version>
-          <type>String</type>
-          <identifier>true</identifier>
-        </field>
-        <field>
-          <name>lastPasswordChange</name>
-          <version>1.0.0+</version>
-          <type>Date</type>
-        </field>
-        <field>
-          <name>lastLoginDate</name>
-          <version>1.0.0+</version>
-          <type>Date</type>
-        </field>
-        <field>
-          <name>countFailedLoginAttempts</name>
-          <version>1.0.0+</version>
-          <type>int</type>
-        </field>
-        <field>
-          <name>locked</name>
-          <version>1.0.0+</version>
-          <type>boolean</type>
-          <defaultValue>false</defaultValue>
-          <identifier>true</identifier>
-        </field>
-        <field>
-          <name>permanent</name>
-          <version>1.0.0+</version>
-          <type>boolean</type>
-          <defaultValue>false</defaultValue>
-          <identifier>true</identifier>
-        </field>
-        <field>
-          <name>validated</name>
-          <version>1.0.0+</version>
-          <type>boolean</type>
-          <defaultValue>false</defaultValue>
-          <identifier>true</identifier>
-        </field>
-        <field>
-          <name>passwordChangeRequired</name>
-          <version>1.0.0+</version>
-          <type>boolean</type>
-          <defaultValue>false</defaultValue>
-          <identifier>true</identifier>
-        </field>
-        <field>
-          <name>previousEncodedPasswords</name>
-          <version>1.0.0+</version>
-          <association stash.part="true">
-            <type>String</type>
-            <multiplicity>*</multiplicity>
-          </association>
-        </field>
-        <field>
-          <name>accountCreationDate</name>
-          <version>1.0.0+</version>
-          <type>Date</type>
-        </field>
-      </fields>
-      <codeSegments>
-        <codeSegment>
-          <version>1.0.0+</version>
-          <code><![CDATA[
-              public JdoUser()
-              {
-                 // Intentionally initialize List to avoid JPOX NullPointerException Issues.
-                previousEncodedPasswords = new java.util.ArrayList();
-              }
-
-              public Object getPrincipal()
-              {
-                 return username;
-              }
-          ]]></code>
-        </codeSegment>
-      </codeSegments>
-    </class>
-  </classes>
-</model>