From 49f42c8251aeba84e907c58abc84ee84d5ebebe8 Mon Sep 17 00:00:00 2001
From: mindthegab <gabriele@apache.org>
Date: Thu, 10 Jul 2008 10:21:11 +0000
Subject: [PATCH] -- removed src/

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk/maven-alfresco-archetypes@33 04253f4f-3451-0410-a141-5562f1e59037
---
 .../META-INF/maven/archetype-metadata.xml     | 38 +++++++----------
 .../resources/META-INF/maven/archetype.xml    | 28 +++----------
 .../resources/archetype-resources/TODO.txt    |  8 ----
 .../context/service-context.xml               | 34 ---------------
 .../log4j.properties                          | 41 -------------------
 .../module-context.xml                        | 25 -----------
 6 files changed, 19 insertions(+), 155 deletions(-)
 delete mode 100644 maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/context/service-context.xml
 delete mode 100644 maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/log4j.properties
 delete mode 100644 maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/module-context.xml

diff --git a/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 0862c527..52fa12b4 100644
--- a/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,36 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="demoamp">
-<!--
-	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.
-	
--->
+<?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="test">
   <fileSets>
-    <fileSet filtered="true" packaged="true" encoding="UTF-8">
+    <fileSet filtered="false" packaged="true" encoding="UTF-8">
       <directory>src/main/java</directory>
       <includes>
         <include>**/*.java</include>
       </includes>
     </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
+    <fileSet filtered="false" encoding="UTF-8">
       <directory>src/main/webapp</directory>
       <includes>
         <include>**/*.txt</include>
         <include>**/*.jsp</include>
       </includes>
     </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
+    <fileSet filtered="false" encoding="UTF-8">
+      <directory>src/main/config</directory>
+      <includes>
+        <include>**/*.xml</include>
+        <include>**/*.properties</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="false" encoding="UTF-8">
       <directory>src/main/resources</directory>
       <includes>
         <include>**/*.xml</include>
@@ -45,20 +35,20 @@
         <include>**/*.css</include>
       </includes>
     </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
+    <fileSet filtered="false" encoding="UTF-8">
       <directory>src/test/properties</directory>
       <includes>
         <include>**/*.properties</include>
       </includes>
     </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
+    <fileSet filtered="false" encoding="UTF-8">
       <directory>src/test/resources</directory>
       <includes>
         <include>**/*.xml</include>
         <include>**/*.properties</include>
       </includes>
     </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
+    <fileSet filtered="false" encoding="UTF-8">
       <directory></directory>
       <includes>
         <include>module.properties</include>
diff --git a/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml b/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml
index 53c0ccfd..19fd6c60 100644
--- a/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ b/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -1,31 +1,13 @@
-<?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.
-	
--->
-<archetype>
-  <id>maven-alfresco-amp-archetype</id>
+<?xml version="1.0" encoding="UTF-8"?><archetype>
+  <id>test</id>
   <sources>
     <source>src/main/java/Demo.java</source>
     <source>src/main/java/DemoComponent.java</source>
   </sources>
   <resources>
-    <resource>src/main/resources/alfresco/module/org.alfresco.module.demoamp/context/service-context.xml</resource>
-    <resource>src/main/resources/alfresco/module/org.alfresco.module.demoamp/log4j.properties</resource>
-    <resource>src/main/resources/alfresco/module/org.alfresco.module.demoamp/module-context.xml</resource>
+    <resource>src/main/config/context/service-context.xml</resource>
+    <resource>src/main/config/log4j.properties</resource>
+    <resource>src/main/config/module-context.xml</resource>
     <resource>src/main/webapp/css/demoamp.css</resource>
     <resource>src/main/webapp/images/sourcesense.gif</resource>
     <resource>src/main/webapp/jsp/demoamp.jsp</resource>
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/TODO.txt b/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/TODO.txt
index 95f711aa..189957a8 100644
--- a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/TODO.txt
+++ b/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/TODO.txt
@@ -21,7 +21,6 @@ Known Issues:
 
 
 MAJOR:
-- maven-amp-plugin filtering broken
 
 
 MINOR:
@@ -30,13 +29,6 @@ file and not accepted by alfresco as valid module version number
 
 
 TRIVIAL:
-- Slighly different deployment for AMP and test WAR. In the test jetty
-war java classes are *not* packed in the war as in the AMP specification,
-but this *must* not have functional impacts on the application
 
 IMPROVEMENTS:
-- maven-amp-plugin is *heavily* redundant. must be simplified to package an 
-amp and process overlays
-- maven-amp-plugin could read maven dependencies and turn them into
-module dependencies in module.properties
 - maven-sql-plugin to autocreate jetty db
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/context/service-context.xml b/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/context/service-context.xml
deleted file mode 100644
index 1dd4b07e..00000000
--- a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/context/service-context.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='${version}' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-<!--
-	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.
-	
--->
-<beans>
-    
-    <!-- A simple class that is initialized by Spring -->
-    <bean id="${artifactId}.exampleBean" class="com.sourcesense.demoamp.Demo" init-method="init" />
-    
-    <!-- A simple module component that will be executed once -->
-    <bean id="${artifactId}.exampleComponent" class="com.sourcesense.demoamp.DemoComponent" parent="module.baseComponent" >
-        <property name="moduleId" value="${[pom.groupId}.${pom.artifactId}" />  <!-- See module.properties -->
-        <property name="name" value="exampleComponent" />
-        <property name="description" value="A demonstration component" />
-        <property name="sinceVersion" value="2.0" />
-        <property name="appliesFromVersion" value=".20x" />
-    </bean>
-    
-</beans>
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/log4j.properties b/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/log4j.properties
deleted file mode 100644
index 960dd90b..00000000
--- a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/log4j.properties
+++ /dev/null
@@ -1,41 +0,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.
-   #-----------------------------------------------------------------------
-   # ${artifactId} module log4j.properties
-   #
-   #   NOTE
-   #   ----
-   #      Log4j uses the following logging levels:
-   #      debug,info,warn,error,fatal
-   #
-   #      To set the logging level of {fullClassName} to {loglevel},
-   #      add a line to this file of the following form:
-   #   
-   #               log4j.logger.{fullClassName}={loglevel}
-   #
-   #      For example, to make 'com.example.MyExample' produce 'debug'
-   #      logs, add a line like this:
-   #   
-   #               log4j.logger.com.example.MyExample=debug
-   #
-   #
-   #   WARNING
-   #   -------
-   #       Log properties in this log4j.properties file override/augment
-   #       those in the webapp's main log4j.properties.
-   #    
-   #-----------------------------------------------------------------------
-  
-   log4j.logger.com.sourcesense.demoamp.DemoComponent=${module.log.level}
\ No newline at end of file
diff --git a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/module-context.xml b/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/module-context.xml
deleted file mode 100644
index b2c5cee7..00000000
--- a/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/org.alfresco.module.demoamp/module-context.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='${version}' 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.
-	
--->
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-	
-    <import resource="classpath:alfresco/module/com.sourcesense.demoamp/context/service-context.xml" />
-    
-</beans>