Author: olamy
Date: Wed Nov 28 23:10:42 2012
New Revision: 1414985
URL: http://svn.apache.org/viewvc?rev=1414985&view=rev
Log:
fix license headers in plugin store
Modified:
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/pom.xml
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/java/org/codehaus/modello/plugin/store/metadata/StoreMetadataPlugin.java
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/META-INF/plexus/components.xml
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/Store.vm
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/StoreException.vm
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/java/org/codehaus/modello/plugin/store/StoreModelloGeneratorTest.java
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/resources/mergere-tissue.mdo
archiva/redback/redback-components/trunk/pom.xml
Modified:
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/pom.xml?rev=1414985&r1=1414984&r2=1414985&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/pom.xml
(original)
+++
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/pom.xml
Wed Nov 28 23:10:42 2012
@@ -30,6 +30,17 @@
<dependencies>
<dependency>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-core</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-test</artifactId>
+ <version>1.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.1.4</version>
Modified:
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/java/org/codehaus/modello/plugin/store/metadata/StoreMetadataPlugin.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/java/org/codehaus/modello/plugin/store/metadata/StoreMetadataPlugin.java?rev=1414985&r1=1414984&r2=1414985&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/java/org/codehaus/modello/plugin/store/metadata/StoreMetadataPlugin.java
(original)
+++
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/java/org/codehaus/modello/plugin/store/metadata/StoreMetadataPlugin.java
Wed Nov 28 23:10:42 2012
@@ -24,11 +24,13 @@ import org.codehaus.modello.metadata.Abs
import org.codehaus.modello.metadata.AssociationMetadata;
import org.codehaus.modello.metadata.ClassMetadata;
import org.codehaus.modello.metadata.FieldMetadata;
+import org.codehaus.modello.metadata.InterfaceMetadata;
import org.codehaus.modello.metadata.ModelMetadata;
import org.codehaus.modello.model.Model;
import org.codehaus.modello.model.ModelAssociation;
import org.codehaus.modello.model.ModelClass;
import org.codehaus.modello.model.ModelField;
+import org.codehaus.modello.model.ModelInterface;
import org.codehaus.plexus.util.StringUtils;
import java.util.Collections;
@@ -54,6 +56,13 @@ public class StoreMetadataPlugin
return new StoreModelMetadata();
}
+ public InterfaceMetadata getInterfaceMetadata( ModelInterface
modelInterface, Map<String, String> stringStringMap )
+ throws ModelloException
+ {
+ // TODO implements ?
+ return null;
+ }
+
public ClassMetadata getClassMetadata( ModelClass clazz, Map data )
throws ModelloException
{
Modified:
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/META-INF/plexus/components.xml?rev=1414985&r1=1414984&r2=1414985&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/META-INF/plexus/components.xml
(original)
+++
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/META-INF/plexus/components.xml
Wed Nov 28 23:10:42 2012
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
<component-set>
<components>
Modified:
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/Store.vm
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/Store.vm?rev=1414985&r1=1414984&r2=1414985&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/Store.vm
(original)
+++
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/Store.vm
Wed Nov 28 23:10:42 2012
@@ -1,5 +1,21 @@
package ${package};
+##
+## Copyright 2001-2005 The Apache Software Foundation.
+##
+## Licensed 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.
+##
+
/**
* Generated storage mechanism for the $model.name model.
*
Modified:
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/StoreException.vm
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/StoreException.vm?rev=1414985&r1=1414984&r2=1414985&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/StoreException.vm
(original)
+++
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/main/resources/org/codehaus/modello/plugin/store/templates/StoreException.vm
Wed Nov 28 23:10:42 2012
@@ -1,5 +1,21 @@
package ${package};
+##
+## Copyright 2001-2005 The Apache Software Foundation.
+##
+## Licensed 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.
+##
+
/**
* Generated exception for the store for the $model.name model.
*
Modified:
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/java/org/codehaus/modello/plugin/store/StoreModelloGeneratorTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/java/org/codehaus/modello/plugin/store/StoreModelloGeneratorTest.java?rev=1414985&r1=1414984&r2=1414985&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/java/org/codehaus/modello/plugin/store/StoreModelloGeneratorTest.java
(original)
+++
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/java/org/codehaus/modello/plugin/store/StoreModelloGeneratorTest.java
Wed Nov 28 23:10:42 2012
@@ -1,25 +1,22 @@
package org.codehaus.modello.plugin.store;
/*
- * Copyright (c) 2005, Codehaus.org
+ * 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
*
- * Permission is hereby granted, free of charge, to any person obtaining a
copy of
- * this software and associated documentation files (the "Software"), to deal
in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies
- * of the Software, and to permit persons to whom the Software is furnished to
do
- * so, subject to the following conditions:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * The above copyright notice and this permission notice shall be included in
all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE
- * SOFTWARE.
+ * 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.
*/
import org.codehaus.modello.AbstractModelloGeneratorTest;
@@ -51,7 +48,7 @@ public class StoreModelloGeneratorTest
Properties parameters = new Properties();
- parameters.setProperty( ModelloParameterConstants.OUTPUT_DIRECTORY,
getGeneratedSources().getAbsolutePath() );
+ parameters.setProperty( ModelloParameterConstants.OUTPUT_DIRECTORY,
getOutputDirectory().getPath() );
parameters.setProperty( ModelloParameterConstants.VERSION, "4.0.0" );
Modified:
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/resources/mergere-tissue.mdo
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/resources/mergere-tissue.mdo?rev=1414985&r1=1414984&r2=1414985&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/resources/mergere-tissue.mdo
(original)
+++
archiva/redback/redback-components/trunk/modello-plugins/modello-plugin-store/src/test/resources/mergere-tissue.mdo
Wed Nov 28 23:10:42 2012
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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>tissue</id>
<name>Tissue</name>
Modified: archiva/redback/redback-components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/pom.xml?rev=1414985&r1=1414984&r2=1414985&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/pom.xml (original)
+++ archiva/redback/redback-components/trunk/pom.xml Wed Nov 28 23:10:42 2012
@@ -56,6 +56,7 @@
<module>spring-apacheds</module>
<module>spring-utils</module>
<module>redback-features</module>
+ <module>modello-plugins</module>
</modules>
<build>
<plugins>
