You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2009/08/22 12:54:24 UTC
svn commit: r806837 [1/2] - in /continuum/trunk: ./
continuum-base/continuum-configuration/
continuum-base/continuum-configuration/src/main/mdo/
continuum-buildagent/continuum-buildagent-api/
continuum-buildagent/continuum-buildagent-api/src/main/mdo/ ...
Author: ctan
Date: Sat Aug 22 10:54:22 2009
New Revision: 806837
URL: http://svn.apache.org/viewvc?rev=806837&view=rev
Log:
[CONTINUUM-2141] upgrade modello to 1.1
merge -r806833:806834 of 1.3.x branch
Added:
continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/project/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/project/v1_0_9/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/project/v1_0_9/ContinuumModelloMetadata.java (with props)
continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/
continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdo
continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdorepl
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/jdo/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java (with props)
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/jdo/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/jdo/v0_9_0/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/jdo/v0_9_0/PlexusSecurityKeyManagementJdoModelloMetadata.java (with props)
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/jdo/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/jdo/v0_9_0/
continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/jdo/v0_9_0/UserManagementModelloMetadata.java (with props)
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdo
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdorepl
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdo
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdorepl
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdo
continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdorepl
continuum/trunk/continuum-model/src/main/java/org/apache/maven/
continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/
continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/model/
continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/model/project/
continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/model/project/ContinuumModelloMetadata.java (with props)
continuum/trunk/continuum-model/src/main/resources/META-INF/
continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdo
continuum/trunk/continuum-model/src/main/resources/META-INF/package.jdorepl
Modified:
continuum/trunk/continuum-base/continuum-configuration/pom.xml
continuum/trunk/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml
continuum/trunk/continuum-buildagent/continuum-buildagent-api/pom.xml
continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml
continuum/trunk/continuum-commons/src/test/resources/conf/continuum.xml
continuum/trunk/continuum-data-management/continuum-legacy/pom.xml
continuum/trunk/continuum-data-management/redback-legacy/pom.xml
continuum/trunk/continuum-model/pom.xml
continuum/trunk/continuum-release/pom.xml
continuum/trunk/continuum-webapp/pom.xml
continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml
continuum/trunk/pom.xml
Modified: continuum/trunk/continuum-base/continuum-configuration/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/pom.xml?rev=806837&r1=806836&r2=806837&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-configuration/pom.xml (original)
+++ continuum/trunk/continuum-base/continuum-configuration/pom.xml Sat Aug 22 10:54:22 2009
@@ -36,6 +36,7 @@
<model>src/main/mdo/continuum-configuration.xml</model>
</models>
<version>1.1.1</version>
+ <useJava5>true</useJava5>
</configuration>
<executions>
<execution>
Modified: continuum/trunk/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml?rev=806837&r1=806836&r2=806837&view=diff
==============================================================================
--- continuum/trunk/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml (original)
+++ continuum/trunk/continuum-base/continuum-configuration/src/main/mdo/continuum-configuration.xml Sat Aug 22 10:54:22 2009
@@ -17,7 +17,7 @@
~ under the License.
-->
-<model>
+<model xsd.namespace="http://modello.codehaus.org/xsd/modello-1.0.0.xsd">
<id>continuum-configuration</id>
<name>ContinuumConfigurationModel</name>
<description>Continuum Configuration object model.</description>
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/pom.xml?rev=806837&r1=806836&r2=806837&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/pom.xml (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/pom.xml Sat Aug 22 10:54:22 2009
@@ -37,6 +37,7 @@
<models>
<model>src/main/mdo/continuum-buildagent.xml</model>
</models>
+ <useJava5>true</useJava5>
<version>1.0.0</version>
</configuration>
<executions>
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml?rev=806837&r1=806836&r2=806837&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml Sat Aug 22 10:54:22 2009
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<model>
+<model xsd.namespace="http://modello.codehaus.org/xsd/modello-1.0.0.xsd">
<id>continuum-buildagent</id>
<name>ContinuumBuildAgentConfigurationModel</name>
<description>Continuum Build Agent object model.</description>
Modified: continuum/trunk/continuum-commons/src/test/resources/conf/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/test/resources/conf/continuum.xml?rev=806837&r1=806836&r2=806837&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/test/resources/conf/continuum.xml (original)
+++ continuum/trunk/continuum-commons/src/test/resources/conf/continuum.xml Sat Aug 22 10:54:22 2009
@@ -9,5 +9,4 @@
<enabled>true</enabled>
</buildAgent>
</buildAgents>
- <distributedBuildEnabled>true</distributedBuildEnabled>
</continuum-configuration>
\ No newline at end of file
Modified: continuum/trunk/continuum-data-management/continuum-legacy/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/continuum-legacy/pom.xml?rev=806837&r1=806836&r2=806837&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/continuum-legacy/pom.xml (original)
+++ continuum/trunk/continuum-data-management/continuum-legacy/pom.xml Sat Aug 22 10:54:22 2009
@@ -36,36 +36,19 @@
<execution>
<id>modello-continuum-metadata</id>
<goals>
- <goal>jpox-metadata-class</goal>
<goal>java</goal>
<goal>stax-reader</goal>
<goal>stax-writer</goal>
</goals>
</execution>
- <execution>
- <id>jpox-jdo-mapping</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>jpox-jdo-mapping-replication</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
- <replicationParameters>true</replicationParameters>
- </configuration>
- </execution>
</executions>
<configuration>
<version>1.0.9</version>
<packageWithVersion>true</packageWithVersion>
- <model>src/main/mdo/continuum.xml</model>
+ <models>
+ <model>src/main/mdo/continuum.xml</model>
+ </models>
+ <useJava5>true</useJava5>
</configuration>
</plugin>
<plugin>
@@ -83,12 +66,14 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>hack-sources</id>
- <phase>process-sources</phase>
+ <id>hack-resources</id>
+ <phase>process-classes</phase>
<configuration>
<tasks>
- <!-- Workaround for MODELLO-89 -->
- <replace file="target/generated-sources/modello/org/apache/maven/continuum/model/project/v1_0_9/ContinuumModelloMetadata.java" token="project;" value="project.v1_0_9;" />
+ <move file="target/classes/META-INF/package.jdorepl" tofile="target/classes/META-INF/package.jdorepl109" />
+ <move file="target/classes/META-INF/package.jdo" tofile="target/classes/META-INF/package.jdo109" />
+ <delete file="target/classes/package.jdo" />
+ <delete file="target/classes/package.jdorepl" />
</tasks>
</configuration>
<goals>
@@ -96,22 +81,13 @@
</goals>
</execution>
<execution>
- <id>hack-resources</id>
+ <id>copy-resources</id>
+ <!-- Need to perform the workaround for MODELLO-91 first -->
<phase>process-classes</phase>
<configuration>
<tasks>
- <!-- Workaround for MODELLO-91 -->
- <replace dir="target/classes/META-INF" token="name="notifiertype"" value="name="type"" />
- <replace dir="target/classes/META-INF" token="name="resultstate"" value="name="state"" />
- <replace dir="target/classes/META-INF" token="name="resulttrigger"" value="name="trigger"" />
- <replace dir="target/classes/META-INF" token="name="projectstate"" value="name="state"" />
- <replace dir="target/classes/META-INF" token="name="changecomment"" value="name="comment"" />
- <replace dir="target/classes/META-INF" token="name="changedate"" value="name="date"" />
- <replace dir="target/classes/META-INF" token="name="scheduledelay"" value="name="delay"" />
- <move file="target/classes/META-INF/package.jdorepl" tofile="target/classes/META-INF/package.jdorepl109" />
- <move file="target/classes/META-INF/package.jdo" tofile="target/classes/META-INF/package.jdo109" />
- <delete file="target/classes/package.jdo" />
- <delete file="target/classes/package.jdorepl" />
+ <copy file="target/classes/META-INF/package.jdorepl109" todir="target/classes"/>
+ <copy file="target/classes/META-INF/package.jdo109" todir="target/classes"/>
</tasks>
</configuration>
<goals>
Added: continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/project/v1_0_9/ContinuumModelloMetadata.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/project/v1_0_9/ContinuumModelloMetadata.java?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/project/v1_0_9/ContinuumModelloMetadata.java (added)
+++ continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/project/v1_0_9/ContinuumModelloMetadata.java Sat Aug 22 10:54:22 2009
@@ -0,0 +1,16 @@
+package org.apache.maven.continuum.model.project.v1_0_9;
+
+public class ContinuumModelloMetadata
+{
+ private String modelVersion;
+
+ public String getModelVersion()
+ {
+ return modelVersion;
+ }
+
+ public void setModelVersion( String modelVersion )
+ {
+ this.modelVersion = modelVersion;
+ }
+}
Propchange: continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/project/v1_0_9/ContinuumModelloMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-data-management/continuum-legacy/src/main/java/org/apache/maven/continuum/model/project/v1_0_9/ContinuumModelloMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdo
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdo?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdo (added)
+++ continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdo Sat Aug 22 10:54:22 2009
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jdo PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+ "http://java.sun.com/dtd/jdo_2_0.dtd">
+
+<jdo>
+ <package name="org.apache.maven.continuum.model.project.v1_0_9">
+ <class name="ProjectGroup" detachable="true" table="ProjectGroup" identity-type="application" objectid-class="javax.jdo.identity.IntIdentity">
+ <field name="id" null-value="exception" primary-key="true" value-strategy="native"/>
+ <field name="groupId"/>
+ <field name="name"/>
+ <field name="description">
+ <column length="8192"/>
+ </field>
+ <field name="projects" mapped-by="projectGroup">
+ <collection element-type="Project" dependent-element="true"/>
+ </field>
+ <field name="notifiers">
+ <collection element-type="ProjectNotifier" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="buildDefinitions">
+ <collection element-type="BuildDefinition" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="ProjectGroup_detail">
+ <field name="projects"/>
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="project-build-details">
+ <field name="projects"/>
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="projectgroup-projects">
+ <field name="projects"/>
+ </fetch-group>
+ </class>
+ <class name="Project" detachable="true" table="Project" identity-type="application" objectid-class="javax.jdo.identity.IntIdentity">
+ <field name="id" null-value="exception" primary-key="true" value-strategy="native"/>
+ <field name="groupId"/>
+ <field name="artifactId"/>
+ <field name="executorId"/>
+ <field name="name"/>
+ <field name="description">
+ <column length="8192"/>
+ </field>
+ <field name="url">
+ <column length="256"/>
+ </field>
+ <field name="scmUrl">
+ <column length="256"/>
+ </field>
+ <field name="scmTag"/>
+ <field name="scmUsername"/>
+ <field name="scmPassword"/>
+ <field name="version"/>
+ <field name="state">
+ <column name="state"/>
+ </field>
+ <field name="oldState"/>
+ <field name="latestBuildId"/>
+ <field name="buildNumber"/>
+ <field name="workingDirectory">
+ <column length="256"/>
+ </field>
+ <field name="buildResults" mapped-by="project">
+ <collection element-type="BuildResult" dependent-element="true"/>
+ </field>
+ <field name="checkoutResult" dependent="true"/>
+ <field name="developers">
+ <collection element-type="ProjectDeveloper" dependent-element="true"/>
+ </field>
+ <field name="parent" dependent="true"/>
+ <field name="dependencies">
+ <collection element-type="ProjectDependency" dependent-element="true"/>
+ </field>
+ <field name="projectGroup" null-value="exception" default-fetch-group="true"/>
+ <field name="notifiers">
+ <collection element-type="ProjectNotifier" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="buildDefinitions">
+ <collection element-type="BuildDefinition" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="Project_detail">
+ <field name="buildResults"/>
+ <field name="checkoutResult"/>
+ <field name="developers"/>
+ <field name="parent"/>
+ <field name="dependencies"/>
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="project-all-details">
+ <field name="developers"/>
+ <field name="parent"/>
+ <field name="dependencies"/>
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="project-build-details">
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="project-with-builds">
+ <field name="buildResults"/>
+ </fetch-group>
+ <fetch-group name="project-dependencies">
+ <field name="parent"/>
+ <field name="dependencies"/>
+ </fetch-group>
+ <fetch-group name="project-with-checkout-result">
+ <field name="checkoutResult"/>
+ </fetch-group>
+ </class>
+ <class name="ProjectNotifier" detachable="true" table="ProjectNotifier" identity-type="application" objectid-class="javax.jdo.identity.IntIdentity">
+ <field name="id" null-value="exception" primary-key="true" value-strategy="native"/>
+ <field name="type">
+ <column name="type"/>
+ </field>
+ <field name="from">
+ <column name="notifierorigin"/>
+ </field>
+ <field name="enabled"/>
+ <field name="recipientType"/>
+ <field name="sendOnSuccess"/>
+ <field name="sendOnFailure"/>
+ <field name="sendOnError"/>
+ <field name="sendOnWarning"/>
+ <field name="configuration" default-fetch-group="true">
+ <map key-type="java.lang.String" value-type="java.lang.String" dependent-key="true" dependent-value="true"/>
+ <join/>
+ </field>
+ </class>
+ <class name="ProjectDeveloper" detachable="true" table="ProjectDeveloper">
+ <field name="scmId"/>
+ <field name="name"/>
+ <field name="email"/>
+ <field name="continuumId"/>
+ </class>
+ <class name="ProjectDependency" detachable="true" table="ProjectDependency">
+ <field name="groupId"/>
+ <field name="artifactId"/>
+ <field name="version"/>
+ </class>
+ <class name="BuildResult" detachable="true" table="BuildResult" identity-type="application" objectid-class="javax.jdo.identity.IntIdentity">
+ <field name="project" default-fetch-group="true"/>
+ <field name="id" primary-key="true" value-strategy="native"/>
+ <field name="buildNumber"/>
+ <field name="state">
+ <column name="state"/>
+ </field>
+ <field name="trigger">
+ <column name="trigger"/>
+ </field>
+ <field name="startTime"/>
+ <field name="endTime"/>
+ <field name="error">
+ <column length="8192"/>
+ </field>
+ <field name="success"/>
+ <field name="exitCode"/>
+ <field name="scmResult" dependent="true"/>
+ <field name="testResult" dependent="true"/>
+ <fetch-group name="BuildResult_detail">
+ <field name="scmResult"/>
+ <field name="testResult"/>
+ </fetch-group>
+ <fetch-group name="build-result-with-details">
+ <field name="scmResult"/>
+ <field name="testResult"/>
+ </fetch-group>
+ </class>
+ <class name="BuildDefinition" detachable="true" table="BuildDefinition" identity-type="application" objectid-class="javax.jdo.identity.IntIdentity">
+ <field name="id" null-value="exception" primary-key="true" value-strategy="native"/>
+ <field name="defaultForProject"/>
+ <field name="goals"/>
+ <field name="arguments"/>
+ <field name="buildFile"/>
+ <field name="schedule" default-fetch-group="true"/>
+ <field name="latestBuildId" null-value="default">
+ <column default-value="0"/>
+ </field>
+ </class>
+ <class name="Schedule" detachable="true" table="Schedule" identity-type="application" objectid-class="javax.jdo.identity.IntIdentity">
+ <field name="id" primary-key="true" value-strategy="native"/>
+ <field name="active"/>
+ <field name="name"/>
+ <field name="description"/>
+ <field name="delay">
+ <column name="delay"/>
+ </field>
+ <field name="maxJobExecutionTime"/>
+ <field name="cronExpression"/>
+ </class>
+ <class name="ContinuumModelloMetadata" detachable="true">
+ <field name="modelVersion" null-value="default">
+ <column default-value="1.0.9"/>
+ </field>
+ </class>
+ </package>
+ <package name="org.apache.maven.continuum.model.scm.v1_0_9">
+ <class name="ScmResult" detachable="true" table="ScmResult">
+ <field name="success"/>
+ <field name="commandLine">
+ <column length="1024"/>
+ </field>
+ <field name="providerMessage">
+ <column length="1024"/>
+ </field>
+ <field name="commandOutput">
+ <column length="1024"/>
+ </field>
+ <field name="exception">
+ <column name="exceptionstring" length="8192"/>
+ </field>
+ <field name="changes" default-fetch-group="true">
+ <collection element-type="ChangeSet" dependent-element="true"/>
+ </field>
+ </class>
+ <class name="ChangeSet" detachable="true" table="ChangeSet">
+ <field name="author"/>
+ <field name="comment">
+ <column name="comment" length="8192"/>
+ </field>
+ <field name="date">
+ <column name="date"/>
+ </field>
+ <field name="files" default-fetch-group="true">
+ <collection element-type="ChangeFile" dependent-element="true"/>
+ </field>
+ </class>
+ <class name="ChangeFile" detachable="true" table="ChangeFile">
+ <field name="name"/>
+ <field name="revision"/>
+ <field name="status"/>
+ </class>
+ <class name="TestResult" detachable="true" table="TestResult">
+ <field name="testCount"/>
+ <field name="failureCount"/>
+ <field name="totalTime"/>
+ <field name="suiteResults" default-fetch-group="true">
+ <collection element-type="SuiteResult" dependent-element="true"/>
+ </field>
+ </class>
+ <class name="SuiteResult" detachable="true" table="SuiteResult">
+ <field name="name"/>
+ <field name="testCount"/>
+ <field name="failureCount"/>
+ <field name="totalTime"/>
+ <field name="failures" default-fetch-group="true">
+ <collection element-type="TestCaseFailure" dependent-element="true"/>
+ </field>
+ </class>
+ <class name="TestCaseFailure" detachable="true" table="TestCaseFailure">
+ <field name="name"/>
+ <field name="exception">
+ <column name="exceptionstring" length="8192"/>
+ </field>
+ </class>
+ </package>
+ <package name="org.apache.maven.continuum.model.system.v1_0_9">
+ <class name="SystemConfiguration" detachable="true" table="SystemConfiguration">
+ <field name="guestAccountEnabled"/>
+ <field name="defaultScheduleDescription"/>
+ <field name="defaultScheduleCronExpression"/>
+ <field name="workingDirectory"/>
+ <field name="buildOutputDirectory"/>
+ <field name="deploymentRepositoryDirectory"/>
+ <field name="baseUrl"/>
+ <field name="initialized"/>
+ </class>
+ <class name="NotificationAddress" detachable="true" table="NotificationAddress">
+ <field name="type">
+ <column name="type"/>
+ </field>
+ <field name="address"/>
+ <field name="configuration" default-fetch-group="true">
+ <map key-type="java.lang.String" value-type="java.lang.String" dependent-key="true" dependent-value="true"/>
+ <join/>
+ </field>
+ </class>
+ </package>
+</jdo>
Added: continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdorepl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdorepl?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdorepl (added)
+++ continuum/trunk/continuum-data-management/continuum-legacy/src/main/resources/META-INF/package.jdorepl Sat Aug 22 10:54:22 2009
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jdo PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+ "http://java.sun.com/dtd/jdo_2_0.dtd">
+
+<jdo>
+ <package name="org.apache.maven.continuum.model.project.v1_0_9">
+ <class name="ProjectGroup" detachable="true" table="ProjectGroup" identity-type="application">
+ <field name="id" null-value="exception" primary-key="true"/>
+ <field name="groupId"/>
+ <field name="name"/>
+ <field name="description">
+ <column length="8192"/>
+ </field>
+ <field name="projects" mapped-by="projectGroup">
+ <collection element-type="Project" dependent-element="true"/>
+ </field>
+ <field name="notifiers">
+ <collection element-type="ProjectNotifier" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="buildDefinitions">
+ <collection element-type="BuildDefinition" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="ProjectGroup_detail">
+ <field name="projects"/>
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="project-build-details">
+ <field name="projects"/>
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="projectgroup-projects">
+ <field name="projects"/>
+ </fetch-group>
+ </class>
+ <class name="Project" detachable="true" table="Project" identity-type="application">
+ <field name="id" null-value="exception" primary-key="true"/>
+ <field name="groupId"/>
+ <field name="artifactId"/>
+ <field name="executorId"/>
+ <field name="name"/>
+ <field name="description">
+ <column length="8192"/>
+ </field>
+ <field name="url">
+ <column length="256"/>
+ </field>
+ <field name="scmUrl">
+ <column length="256"/>
+ </field>
+ <field name="scmTag"/>
+ <field name="scmUsername"/>
+ <field name="scmPassword"/>
+ <field name="version"/>
+ <field name="state">
+ <column name="state"/>
+ </field>
+ <field name="oldState"/>
+ <field name="latestBuildId"/>
+ <field name="buildNumber"/>
+ <field name="workingDirectory">
+ <column length="256"/>
+ </field>
+ <field name="buildResults" mapped-by="project">
+ <collection element-type="BuildResult" dependent-element="true"/>
+ </field>
+ <field name="checkoutResult" dependent="true"/>
+ <field name="developers">
+ <collection element-type="ProjectDeveloper" dependent-element="true"/>
+ </field>
+ <field name="parent" dependent="true"/>
+ <field name="dependencies">
+ <collection element-type="ProjectDependency" dependent-element="true"/>
+ </field>
+ <field name="projectGroup" null-value="exception" default-fetch-group="true"/>
+ <field name="notifiers">
+ <collection element-type="ProjectNotifier" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="buildDefinitions">
+ <collection element-type="BuildDefinition" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="Project_detail">
+ <field name="buildResults"/>
+ <field name="checkoutResult"/>
+ <field name="developers"/>
+ <field name="parent"/>
+ <field name="dependencies"/>
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="project-all-details">
+ <field name="developers"/>
+ <field name="parent"/>
+ <field name="dependencies"/>
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="project-build-details">
+ <field name="notifiers"/>
+ <field name="buildDefinitions"/>
+ </fetch-group>
+ <fetch-group name="project-with-builds">
+ <field name="buildResults"/>
+ </fetch-group>
+ <fetch-group name="project-dependencies">
+ <field name="parent"/>
+ <field name="dependencies"/>
+ </fetch-group>
+ <fetch-group name="project-with-checkout-result">
+ <field name="checkoutResult"/>
+ </fetch-group>
+ </class>
+ <class name="ProjectNotifier" detachable="true" table="ProjectNotifier" identity-type="application">
+ <field name="id" null-value="exception" primary-key="true"/>
+ <field name="type">
+ <column name="type"/>
+ </field>
+ <field name="from">
+ <column name="notifierorigin"/>
+ </field>
+ <field name="enabled"/>
+ <field name="recipientType"/>
+ <field name="sendOnSuccess"/>
+ <field name="sendOnFailure"/>
+ <field name="sendOnError"/>
+ <field name="sendOnWarning"/>
+ <field name="configuration" default-fetch-group="true">
+ <map key-type="java.lang.String" value-type="java.lang.String" dependent-key="true" dependent-value="true"/>
+ <join/>
+ </field>
+ </class>
+ <class name="ProjectDeveloper" detachable="true" table="ProjectDeveloper">
+ <field name="scmId"/>
+ <field name="name"/>
+ <field name="email"/>
+ <field name="continuumId"/>
+ </class>
+ <class name="ProjectDependency" detachable="true" table="ProjectDependency">
+ <field name="groupId"/>
+ <field name="artifactId"/>
+ <field name="version"/>
+ </class>
+ <class name="BuildResult" detachable="true" table="BuildResult" identity-type="application">
+ <field name="project" default-fetch-group="true"/>
+ <field name="id" primary-key="true"/>
+ <field name="buildNumber"/>
+ <field name="state">
+ <column name="state"/>
+ </field>
+ <field name="trigger">
+ <column name="trigger"/>
+ </field>
+ <field name="startTime"/>
+ <field name="endTime"/>
+ <field name="error">
+ <column length="8192"/>
+ </field>
+ <field name="success"/>
+ <field name="exitCode"/>
+ <field name="scmResult" dependent="true"/>
+ <field name="testResult" dependent="true"/>
+ <fetch-group name="BuildResult_detail">
+ <field name="scmResult"/>
+ <field name="testResult"/>
+ </fetch-group>
+ <fetch-group name="build-result-with-details">
+ <field name="scmResult"/>
+ <field name="testResult"/>
+ </fetch-group>
+ </class>
+ <class name="BuildDefinition" detachable="true" table="BuildDefinition" identity-type="application">
+ <field name="id" null-value="exception" primary-key="true"/>
+ <field name="defaultForProject"/>
+ <field name="goals"/>
+ <field name="arguments"/>
+ <field name="buildFile"/>
+ <field name="schedule" default-fetch-group="true"/>
+ <field name="latestBuildId" null-value="default">
+ <column default-value="0"/>
+ </field>
+ </class>
+ <class name="Schedule" detachable="true" table="Schedule" identity-type="application">
+ <field name="id" primary-key="true"/>
+ <field name="active"/>
+ <field name="name"/>
+ <field name="description"/>
+ <field name="delay">
+ <column name="delay"/>
+ </field>
+ <field name="maxJobExecutionTime"/>
+ <field name="cronExpression"/>
+ </class>
+ <class name="ContinuumModelloMetadata" detachable="true">
+ <field name="modelVersion" null-value="default">
+ <column default-value="1.0.9"/>
+ </field>
+ </class>
+ </package>
+ <package name="org.apache.maven.continuum.model.scm.v1_0_9">
+ <class name="ScmResult" detachable="true" table="ScmResult">
+ <field name="success"/>
+ <field name="commandLine">
+ <column length="1024"/>
+ </field>
+ <field name="providerMessage">
+ <column length="1024"/>
+ </field>
+ <field name="commandOutput">
+ <column length="1024"/>
+ </field>
+ <field name="exception">
+ <column name="exceptionstring" length="8192"/>
+ </field>
+ <field name="changes" default-fetch-group="true">
+ <collection element-type="ChangeSet" dependent-element="true"/>
+ </field>
+ </class>
+ <class name="ChangeSet" detachable="true" table="ChangeSet">
+ <field name="author"/>
+ <field name="comment">
+ <column name="comment" length="8192"/>
+ </field>
+ <field name="date">
+ <column name="date"/>
+ </field>
+ <field name="files" default-fetch-group="true">
+ <collection element-type="ChangeFile" dependent-element="true"/>
+ </field>
+ </class>
+ <class name="ChangeFile" detachable="true" table="ChangeFile">
+ <field name="name"/>
+ <field name="revision"/>
+ <field name="status"/>
+ </class>
+ <class name="TestResult" detachable="true" table="TestResult">
+ <field name="testCount"/>
+ <field name="failureCount"/>
+ <field name="totalTime"/>
+ <field name="suiteResults" default-fetch-group="true">
+ <collection element-type="SuiteResult" dependent-element="true"/>
+ </field>
+ </class>
+ <class name="SuiteResult" detachable="true" table="SuiteResult">
+ <field name="name"/>
+ <field name="testCount"/>
+ <field name="failureCount"/>
+ <field name="totalTime"/>
+ <field name="failures" default-fetch-group="true">
+ <collection element-type="TestCaseFailure" dependent-element="true"/>
+ </field>
+ </class>
+ <class name="TestCaseFailure" detachable="true" table="TestCaseFailure">
+ <field name="name"/>
+ <field name="exception">
+ <column name="exceptionstring" length="8192"/>
+ </field>
+ </class>
+ </package>
+ <package name="org.apache.maven.continuum.model.system.v1_0_9">
+ <class name="SystemConfiguration" detachable="true" table="SystemConfiguration">
+ <field name="guestAccountEnabled"/>
+ <field name="defaultScheduleDescription"/>
+ <field name="defaultScheduleCronExpression"/>
+ <field name="workingDirectory"/>
+ <field name="buildOutputDirectory"/>
+ <field name="deploymentRepositoryDirectory"/>
+ <field name="baseUrl"/>
+ <field name="initialized"/>
+ </class>
+ <class name="NotificationAddress" detachable="true" table="NotificationAddress">
+ <field name="type">
+ <column name="type"/>
+ </field>
+ <field name="address"/>
+ <field name="configuration" default-fetch-group="true">
+ <map key-type="java.lang.String" value-type="java.lang.String" dependent-key="true" dependent-value="true"/>
+ <join/>
+ </field>
+ </class>
+ </package>
+</jdo>
Modified: continuum/trunk/continuum-data-management/redback-legacy/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/pom.xml?rev=806837&r1=806836&r2=806837&view=diff
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/pom.xml (original)
+++ continuum/trunk/continuum-data-management/redback-legacy/pom.xml Sat Aug 22 10:54:22 2009
@@ -16,149 +16,59 @@
<execution>
<id>modello-rbac</id>
<goals>
- <goal>jpox-metadata-class</goal>
<goal>java</goal>
<goal>stax-reader</goal>
<goal>stax-writer</goal>
</goals>
<configuration>
- <model>src/main/mdo/rbac-jdo.mdo</model>
- </configuration>
- </execution>
- <execution>
- <id>jpox-jdo-mapping-rbac</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <model>src/main/mdo/rbac-jdo.mdo</model>
- <outputDirectory>
- ${basedir}/target/classes/org/codehaus/plexus/security/authorization/rbac/jdo
- </outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>jpox-jdo-mapping-rbac-replication</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <model>src/main/mdo/rbac-jdo.mdo</model>
- <outputDirectory>
- ${basedir}/target/classes/org/codehaus/plexus/security/authorization/rbac/jdo
- </outputDirectory>
- <replicationParameters>true</replicationParameters>
+ <models>
+ <model>src/main/mdo/rbac-jdo.mdo</model>
+ </models>
</configuration>
</execution>
<execution>
<id>modello-keys</id>
<goals>
- <goal>jpox-metadata-class</goal>
<goal>java</goal>
<goal>stax-reader</goal>
<goal>stax-writer</goal>
</goals>
<configuration>
- <model>src/main/mdo/keys-jdo.mdo</model>
- </configuration>
- </execution>
- <execution>
- <id>jpox-jdo-mapping-keys</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <model>src/main/mdo/keys-jdo.mdo</model>
- <outputDirectory>
- ${basedir}/target/classes/org/codehaus/plexus/security/keys/jdo
- </outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>jpox-jdo-mapping-keys-replication</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <model>src/main/mdo/keys-jdo.mdo</model>
- <outputDirectory>
- ${basedir}/target/classes/org/codehaus/plexus/security/keys/jdo
- </outputDirectory>
- <replicationParameters>true</replicationParameters>
+ <models>
+ <model>src/main/mdo/keys-jdo.mdo</model>
+ </models>
</configuration>
</execution>
<execution>
<id>modello-users</id>
<goals>
- <goal>jpox-metadata-class</goal>
<goal>java</goal>
<goal>stax-reader</goal>
<goal>stax-writer</goal>
</goals>
<configuration>
- <model>src/main/mdo/users-jdo.mdo</model>
- </configuration>
- </execution>
- <execution>
- <id>jpox-jdo-mapping-users</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <model>src/main/mdo/users-jdo.mdo</model>
- <outputDirectory>
- ${basedir}/target/classes/org/codehaus/plexus/security/user/jdo
- </outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>jpox-jdo-mapping-users-replication</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <model>src/main/mdo/users-jdo.mdo</model>
- <outputDirectory>
- ${basedir}/target/classes/org/codehaus/plexus/security/user/jdo
- </outputDirectory>
- <replicationParameters>true</replicationParameters>
+ <models>
+ <model>src/main/mdo/users-jdo.mdo</model>
+ </models>
</configuration>
</execution>
</executions>
<configuration>
<version>0.9.0</version>
<packageWithVersion>true</packageWithVersion>
+ <!--<useJava5>true</useJava5>-->
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>hack-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <!-- Workaround for MODELLO-89 -->
- <replace file="target/generated-sources/modello/org/codehaus/plexus/security/keys/jdo/v0_9_0/PlexusSecurityKeyManagementJdoModelloMetadata.java" token="jdo;" value="jdo.v0_9_0;" />
- <replace file="target/generated-sources/modello/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java" token="jdo;" value="jdo.v0_9_0;" />
- <replace file="target/generated-sources/modello/org/codehaus/plexus/security/user/jdo/v0_9_0/UserManagementModelloMetadata.java" token="jdo;" value="jdo.v0_9_0;" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>hack-resources</id>
- <phase>process-classes</phase>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
<configuration>
<tasks>
- <!-- Workaround for MODELLO-91 -->
- <replace dir="target/classes/org/codehaus/plexus/security/user/jdo" token="name="USER_PASSWORD"" value="name="PASSWORD"" />
- <replace dir="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo" token="SECURITY_" value="" />
- <replace dir="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo" token="name="RBAC_OPERATION"" value="name="OPERATION"" />
- <replace dir="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo" token="name="RBAC_RESOURCE"" value="name="RESOURCE"" />
- <replace dir="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo" token="name="LAST_UPDATED"" value="name="TIMESTAMP"" />
+ <copy file="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdorepl" todir="target/classes"/>
+ <copy file="target/classes/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdo" todir="target/classes"/>
</tasks>
</configuration>
<goals>
Added: continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java (added)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java Sat Aug 22 10:54:22 2009
@@ -0,0 +1,16 @@
+package org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0;
+
+public class RbacJdoModelModelloMetadata
+{
+ private String modelVersion;
+
+ public String getModelVersion()
+ {
+ return modelVersion;
+ }
+
+ public void setModelVersion( String modelVersion )
+ {
+ this.modelVersion = modelVersion;
+ }
+}
Propchange: continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/authorization/rbac/jdo/v0_9_0/RbacJdoModelModelloMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/jdo/v0_9_0/PlexusSecurityKeyManagementJdoModelloMetadata.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/jdo/v0_9_0/PlexusSecurityKeyManagementJdoModelloMetadata.java?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/jdo/v0_9_0/PlexusSecurityKeyManagementJdoModelloMetadata.java (added)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/jdo/v0_9_0/PlexusSecurityKeyManagementJdoModelloMetadata.java Sat Aug 22 10:54:22 2009
@@ -0,0 +1,16 @@
+package org.codehaus.plexus.security.keys.jdo.v0_9_0;
+
+public class PlexusSecurityKeyManagementJdoModelloMetadata
+{
+ private String modelVersion;
+
+ public String getModelVersion()
+ {
+ return modelVersion;
+ }
+
+ public void setModelVersion( String modelVersion )
+ {
+ this.modelVersion = modelVersion;
+ }
+}
Propchange: continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/jdo/v0_9_0/PlexusSecurityKeyManagementJdoModelloMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/keys/jdo/v0_9_0/PlexusSecurityKeyManagementJdoModelloMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/jdo/v0_9_0/UserManagementModelloMetadata.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/jdo/v0_9_0/UserManagementModelloMetadata.java?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/jdo/v0_9_0/UserManagementModelloMetadata.java (added)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/jdo/v0_9_0/UserManagementModelloMetadata.java Sat Aug 22 10:54:22 2009
@@ -0,0 +1,16 @@
+package org.codehaus.plexus.security.user.jdo.v0_9_0;
+
+public class UserManagementModelloMetadata
+{
+ private String modelVersion;
+
+ public String getModelVersion()
+ {
+ return modelVersion;
+ }
+
+ public void setModelVersion( String modelVersion )
+ {
+ this.modelVersion = modelVersion;
+ }
+}
Propchange: continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/jdo/v0_9_0/UserManagementModelloMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-data-management/redback-legacy/src/main/java/org/codehaus/plexus/security/user/jdo/v0_9_0/UserManagementModelloMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdo
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdo?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdo (added)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdo Sat Aug 22 10:54:22 2009
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jdo PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+ "http://java.sun.com/dtd/jdo_2_0.dtd">
+
+<jdo>
+ <package name="org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0">
+ <class name="RbacDatabase" detachable="true" table="RbacDatabase">
+ <field name="roles">
+ <collection element-type="JdoRole" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="permissions">
+ <collection element-type="JdoPermission" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="operations">
+ <collection element-type="JdoOperation" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="resources">
+ <collection element-type="JdoResource" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="userAssignments">
+ <collection element-type="JdoUserAssignment" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="RbacDatabase_detail">
+ <field name="roles"/>
+ <field name="permissions"/>
+ <field name="operations"/>
+ <field name="resources"/>
+ <field name="userAssignments"/>
+ </fetch-group>
+ </class>
+ <class name="JdoRole" detachable="true" table="ROLES" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity">
+ <field name="name" primary-key="true"/>
+ <field name="description"/>
+ <field name="assignable"/>
+ <field name="permanent"/>
+ <field name="childRoleNames" persistence-modifier="persistent" table="ROLE_CHILDROLE_MAP" default-fetch-group="true">
+ <collection element-type="java.lang.String" dependent-element="false"/>
+ <join/>
+ </field>
+ <field name="permissions" table="ROLE_PERMISSION_MAP" default-fetch-group="true">
+ <collection element-type="JdoPermission" dependent-element="false"/>
+ <join/>
+ </field>
+ <fetch-group name="role-child-detail">
+ <field name="childRoleNames"/>
+ <field name="permissions"/>
+ </fetch-group>
+ </class>
+ <class name="JdoPermission" detachable="true" table="PERMISSIONS" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity">
+ <field name="name" primary-key="true"/>
+ <field name="description"/>
+ <field name="permanent"/>
+ <field name="operation" indexed="true" default-fetch-group="true"/>
+ <field name="resource" indexed="true" default-fetch-group="true"/>
+ </class>
+ <class name="JdoOperation" detachable="true" table="OPERATIONS" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity">
+ <field name="name" primary-key="true"/>
+ <field name="description"/>
+ <field name="permanent"/>
+ <field name="resourceRequired"/>
+ </class>
+ <class name="JdoResource" detachable="true" table="RESOURCES" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity">
+ <field name="identifier" primary-key="true"/>
+ <field name="pattern"/>
+ <field name="permanent"/>
+ </class>
+ <class name="JdoUserAssignment" detachable="true" table="USER_ASSIGNMENTS" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity">
+ <field name="principal" primary-key="true"/>
+ <field name="timestamp">
+ <column name="TIMESTAMP"/>
+ </field>
+ <field name="permanent"/>
+ <field name="roleNames" persistence-modifier="persistent" table="USERASSIGNMENT_ROLENAMES" indexed="false" default-fetch-group="true">
+ <collection element-type="java.lang.String" dependent-element="true"/>
+ <join/>
+ </field>
+ </class>
+ <class name="RbacJdoModelModelloMetadata" detachable="true">
+ <field name="modelVersion" null-value="default">
+ <column default-value="0.9.0"/>
+ </field>
+ </class>
+ </package>
+</jdo>
Added: continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdorepl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdorepl?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdorepl (added)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/authorization/rbac/jdo/package.jdorepl Sat Aug 22 10:54:22 2009
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jdo PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+ "http://java.sun.com/dtd/jdo_2_0.dtd">
+
+<jdo>
+ <package name="org.codehaus.plexus.security.authorization.rbac.jdo.v0_9_0">
+ <class name="RbacDatabase" detachable="true" table="RbacDatabase">
+ <field name="roles">
+ <collection element-type="JdoRole" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="permissions">
+ <collection element-type="JdoPermission" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="operations">
+ <collection element-type="JdoOperation" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="resources">
+ <collection element-type="JdoResource" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="userAssignments">
+ <collection element-type="JdoUserAssignment" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="RbacDatabase_detail">
+ <field name="roles"/>
+ <field name="permissions"/>
+ <field name="operations"/>
+ <field name="resources"/>
+ <field name="userAssignments"/>
+ </fetch-group>
+ </class>
+ <class name="JdoRole" detachable="true" table="ROLES" identity-type="application">
+ <field name="name" primary-key="true"/>
+ <field name="description"/>
+ <field name="assignable"/>
+ <field name="permanent"/>
+ <field name="childRoleNames" persistence-modifier="persistent" table="ROLE_CHILDROLE_MAP" default-fetch-group="true">
+ <collection element-type="java.lang.String" dependent-element="false"/>
+ <join/>
+ </field>
+ <field name="permissions" table="ROLE_PERMISSION_MAP" default-fetch-group="true">
+ <collection element-type="JdoPermission" dependent-element="false"/>
+ <join/>
+ </field>
+ <fetch-group name="role-child-detail">
+ <field name="childRoleNames"/>
+ <field name="permissions"/>
+ </fetch-group>
+ </class>
+ <class name="JdoPermission" detachable="true" table="PERMISSIONS" identity-type="application">
+ <field name="name" primary-key="true"/>
+ <field name="description"/>
+ <field name="permanent"/>
+ <field name="operation" indexed="true" default-fetch-group="true"/>
+ <field name="resource" indexed="true" default-fetch-group="true"/>
+ </class>
+ <class name="JdoOperation" detachable="true" table="OPERATIONS" identity-type="application">
+ <field name="name" primary-key="true"/>
+ <field name="description"/>
+ <field name="permanent"/>
+ <field name="resourceRequired"/>
+ </class>
+ <class name="JdoResource" detachable="true" table="RESOURCES" identity-type="application">
+ <field name="identifier" primary-key="true"/>
+ <field name="pattern"/>
+ <field name="permanent"/>
+ </class>
+ <class name="JdoUserAssignment" detachable="true" table="USER_ASSIGNMENTS" identity-type="application">
+ <field name="principal" primary-key="true"/>
+ <field name="timestamp">
+ <column name="TIMESTAMP"/>
+ </field>
+ <field name="permanent"/>
+ <field name="roleNames" persistence-modifier="persistent" table="USERASSIGNMENT_ROLENAMES" indexed="false" default-fetch-group="true">
+ <collection element-type="java.lang.String" dependent-element="true"/>
+ <join/>
+ </field>
+ </class>
+ <class name="RbacJdoModelModelloMetadata" detachable="true">
+ <field name="modelVersion" null-value="default">
+ <column default-value="0.9.0"/>
+ </field>
+ </class>
+ </package>
+</jdo>
Added: continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdo
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdo?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdo (added)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdo Sat Aug 22 10:54:22 2009
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jdo PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+ "http://java.sun.com/dtd/jdo_2_0.dtd">
+
+<jdo>
+ <package name="org.codehaus.plexus.security.keys.jdo.v0_9_0">
+ <class name="AuthenticationKeyDatabase" detachable="true" table="AuthenticationKeyDatabase">
+ <field name="keys">
+ <collection element-type="JdoAuthenticationKey" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="AuthenticationKeyDatabase_detail">
+ <field name="keys"/>
+ </fetch-group>
+ </class>
+ <class name="JdoAuthenticationKey" detachable="true" table="JdoAuthenticationKey" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity">
+ <field name="key" persistence-modifier="persistent" primary-key="true">
+ <column name="AUTHKEY"/>
+ </field>
+ <field name="forPrincipal"/>
+ <field name="purpose"/>
+ <field name="dateCreated"/>
+ <field name="dateExpires"/>
+ </class>
+ <class name="PlexusSecurityKeyManagementJdoModelloMetadata" detachable="true">
+ <field name="modelVersion" null-value="default">
+ <column default-value="0.9.0"/>
+ </field>
+ </class>
+ </package>
+</jdo>
Added: continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdorepl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdorepl?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdorepl (added)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/keys/jdo/package.jdorepl Sat Aug 22 10:54:22 2009
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jdo PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+ "http://java.sun.com/dtd/jdo_2_0.dtd">
+
+<jdo>
+ <package name="org.codehaus.plexus.security.keys.jdo.v0_9_0">
+ <class name="AuthenticationKeyDatabase" detachable="true" table="AuthenticationKeyDatabase">
+ <field name="keys">
+ <collection element-type="JdoAuthenticationKey" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="AuthenticationKeyDatabase_detail">
+ <field name="keys"/>
+ </fetch-group>
+ </class>
+ <class name="JdoAuthenticationKey" detachable="true" table="JdoAuthenticationKey" identity-type="application">
+ <field name="key" persistence-modifier="persistent" primary-key="true">
+ <column name="AUTHKEY"/>
+ </field>
+ <field name="forPrincipal"/>
+ <field name="purpose"/>
+ <field name="dateCreated"/>
+ <field name="dateExpires"/>
+ </class>
+ <class name="PlexusSecurityKeyManagementJdoModelloMetadata" detachable="true">
+ <field name="modelVersion" null-value="default">
+ <column default-value="0.9.0"/>
+ </field>
+ </class>
+ </package>
+</jdo>
Added: continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdo
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdo?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdo (added)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdo Sat Aug 22 10:54:22 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jdo PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+ "http://java.sun.com/dtd/jdo_2_0.dtd">
+
+<jdo>
+ <package name="org.codehaus.plexus.security.user.jdo.v0_9_0">
+ <class name="UserDatabase" detachable="true" table="UserDatabase">
+ <field name="users">
+ <collection element-type="JdoUser" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="UserDatabase_detail">
+ <field name="users"/>
+ </fetch-group>
+ </class>
+ <class name="JdoUser" detachable="true" table="JdoUser" identity-type="application" objectid-class="javax.jdo.identity.StringIdentity">
+ <field name="username" persistence-modifier="persistent" primary-key="true"/>
+ <field name="password">
+ <column name="PASSWORD"/>
+ </field>
+ <field name="encodedPassword"/>
+ <field name="fullName"/>
+ <field name="email"/>
+ <field name="lastPasswordChange"/>
+ <field name="lastLoginDate"/>
+ <field name="countFailedLoginAttempts"/>
+ <field name="locked"/>
+ <field name="permanent"/>
+ <field name="validated"/>
+ <field name="passwordChangeRequired"/>
+ <field name="previousEncodedPasswords" default-fetch-group="true">
+ <collection element-type="java.lang.String" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="accountCreationDate"/>
+ </class>
+ <class name="UserManagementModelloMetadata" detachable="true">
+ <field name="modelVersion" null-value="default">
+ <column default-value="0.9.0"/>
+ </field>
+ </class>
+ </package>
+</jdo>
Added: continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdorepl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdorepl?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdorepl (added)
+++ continuum/trunk/continuum-data-management/redback-legacy/src/main/resources/org/codehaus/plexus/security/user/jdo/package.jdorepl Sat Aug 22 10:54:22 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jdo PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
+ "http://java.sun.com/dtd/jdo_2_0.dtd">
+
+<jdo>
+ <package name="org.codehaus.plexus.security.user.jdo.v0_9_0">
+ <class name="UserDatabase" detachable="true" table="UserDatabase">
+ <field name="users">
+ <collection element-type="JdoUser" dependent-element="true"/>
+ <join/>
+ </field>
+ <fetch-group name="UserDatabase_detail">
+ <field name="users"/>
+ </fetch-group>
+ </class>
+ <class name="JdoUser" detachable="true" table="JdoUser" identity-type="application">
+ <field name="username" persistence-modifier="persistent" primary-key="true"/>
+ <field name="password">
+ <column name="PASSWORD"/>
+ </field>
+ <field name="encodedPassword"/>
+ <field name="fullName"/>
+ <field name="email"/>
+ <field name="lastPasswordChange"/>
+ <field name="lastLoginDate"/>
+ <field name="countFailedLoginAttempts"/>
+ <field name="locked"/>
+ <field name="permanent"/>
+ <field name="validated"/>
+ <field name="passwordChangeRequired"/>
+ <field name="previousEncodedPasswords" default-fetch-group="true">
+ <collection element-type="java.lang.String" dependent-element="true"/>
+ <join/>
+ </field>
+ <field name="accountCreationDate"/>
+ </class>
+ <class name="UserManagementModelloMetadata" detachable="true">
+ <field name="modelVersion" null-value="default">
+ <column default-value="0.9.0"/>
+ </field>
+ </class>
+ </package>
+</jdo>
Modified: continuum/trunk/continuum-model/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/pom.xml?rev=806837&r1=806836&r2=806837&view=diff
==============================================================================
--- continuum/trunk/continuum-model/pom.xml (original)
+++ continuum/trunk/continuum-model/pom.xml Sat Aug 22 10:54:22 2009
@@ -39,33 +39,15 @@
<goal>java</goal>
<goal>stax-reader</goal>
<goal>stax-writer</goal>
- <goal>jpox-metadata-class</goal>
</goals>
</execution>
- <execution>
- <id>jpox-jdo-mapping</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>jpox-jdo-mapping-replication</id>
- <goals>
- <goal>jpox-jdo-mapping</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
- <replicationParameters>true</replicationParameters>
- </configuration>
- </execution>
</executions>
<configuration>
<version>1.4.0</version>
<packageWithVersion>false</packageWithVersion>
- <model>src/main/mdo/continuum.xml</model>
+ <models>
+ <model>src/main/mdo/continuum.xml</model>
+ </models>
</configuration>
</plugin>
<plugin>
@@ -79,6 +61,24 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <copy file="target/classes/META-INF/package.jdorepl" todir="target/classes"/>
+ <copy file="target/classes/META-INF/package.jdo" todir="target/classes"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
Added: continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/model/project/ContinuumModelloMetadata.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/model/project/ContinuumModelloMetadata.java?rev=806837&view=auto
==============================================================================
--- continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/model/project/ContinuumModelloMetadata.java (added)
+++ continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/model/project/ContinuumModelloMetadata.java Sat Aug 22 10:54:22 2009
@@ -0,0 +1,17 @@
+package org.apache.maven.continuum.model.project;
+
+public class ContinuumModelloMetadata
+{
+ private String modelVersion;
+
+ public String getModelVersion()
+ {
+ return modelVersion;
+ }
+
+ public void setModelVersion( String modelVersion )
+ {
+ this.modelVersion = modelVersion;
+ }
+}
+
Propchange: continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/model/project/ContinuumModelloMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/model/project/ContinuumModelloMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision