syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1442055 - in /syncope/trunk: archetype/ archetype/src/main/resources/META-INF/maven/ archetype/src/main/resources/archetype-resources/console/ archetype/src/main/resources/archetype-resources/console/src/ archetype/src/main/resources/arche...
Date Mon, 04 Feb 2013 09:37:59 GMT
Author: ilgrosso
Date: Mon Feb  4 09:37:59 2013
New Revision: 1442055

URL: http://svn.apache.org/viewvc?rev=1442055&view=rev
Log:
[SYNCOPE-277] Copying archetype-resources from core and console modules at build-time by leveraging
Maven's resource handling, no more need to handle these manually

Removed:
    syncope/trunk/archetype/src/main/resources/archetype-resources/console/src/
    syncope/trunk/archetype/src/main/resources/archetype-resources/core/src/
    syncope/trunk/core/src/test/resources/exploredb.jsp
    syncope/trunk/core/src/test/resources/spring.jsp
Modified:
    syncope/trunk/archetype/pom.xml
    syncope/trunk/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
    syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml

Modified: syncope/trunk/archetype/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/archetype/pom.xml?rev=1442055&r1=1442054&r2=1442055&view=diff
==============================================================================
--- syncope/trunk/archetype/pom.xml (original)
+++ syncope/trunk/archetype/pom.xml Mon Feb  4 09:37:59 2013
@@ -16,7 +16,6 @@ software distributed under the License i
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
-
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
@@ -42,16 +41,6 @@ under the License.
     </site>
   </distributionManagement>
   
-  <properties>
-    <SVNRepoURL>http://svn.apache.org/repos/asf/syncope/trunk</SVNRepoURL>
-  </properties>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/syncope/trunk/archetype</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/syncope/trunk/archetype</developerConnection>
-    <url>http://svn.apache.org/repos/asf/syncope/trunk/archetype</url>
-  </scm>
-
   <build>
     <extensions>
       <extension>
@@ -64,6 +53,7 @@ under the License.
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-archetype-plugin</artifactId>
           <version>2.2</version>
           <extensions>true</extensions>
@@ -119,79 +109,6 @@ under the License.
       
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <inherited>true</inherited>
-        <executions>
-          <execution>
-            <id>setupResources</id>
-            <phase>validate</phase>
-            <configuration>
-              <target>
-                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"
/>
-                <if>
-                  <available file="${basedir}/../core/pom.xml" />
-                  <then>
-                    <copy file="${basedir}/../core/src/test/resources/persistence.properties"
todir="${basedir}/src/main/resources/archetype-resources/core/src/test/resources" overwrite="true"
/>
-                    <copy file="${basedir}/../core/src/test/resources/workflow.properties"
todir="${basedir}/src/main/resources/archetype-resources/core/src/test/resources" overwrite="true"
/>
-                    <copy file="${basedir}/../core/src/test/resources/content.xml" todir="${basedir}/src/main/resources/archetype-resources/core/src/test/resources"
overwrite="true" />
-                    <copy file="${basedir}/../core/src/test/resources/test.csv" todir="${basedir}/src/main/resources/archetype-resources/core/src/test/resources"
overwrite="true" />
-                    <copy file="${basedir}/../core/src/test/resources/db.jsp" todir="${basedir}/src/main/resources/archetype-resources/core/src/test/resources"
overwrite="true" />
-
-                    <copy file="${basedir}/../core/src/main/resources/persistence.properties"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources" overwrite="true"
/>
-                    <copy file="${basedir}/../core/src/main/resources/workflow.properties"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources" overwrite="true"
/>
-                    <copy file="${basedir}/../core/src/main/resources/security.properties"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources" overwrite="true"
/>
-                    <copy file="${basedir}/../core/src/main/resources/content.xml" todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources"
overwrite="true" />
-                    <copy file="${basedir}/../core/src/main/resources/activiticontent.xml"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources" overwrite="true"
/>
-                    <copy file="${basedir}/../core/src/main/resources/logback.xml" todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources"
overwrite="true" />
-                    <copy file="${basedir}/../core/src/main/resources/META-INF/spring-persistence.xml"
todir="${basedir}/src/main/resources/archetype-resources/core/src/main/resources/META-INF"
overwrite="true" />
-                    <copy file="${basedir}/../core/src/main/webapp/WEB-INF/web.xml" todir="${basedir}/src/main/resources/archetype-resources/core/src/main/webapp/WEB-INF"
overwrite="true" />
-
-                    <copy file="${basedir}/../console/src/test/resources/configuration.properties"
todir="${basedir}/src/main/resources/archetype-resources/console/src/test/resources" overwrite="true"
/>
-
-                    <copy file="${basedir}/../console/src/main/resources/configuration.properties"
todir="${basedir}/src/main/resources/archetype-resources/console/src/main/resources" overwrite="true"
/>
-                    <copy file="${basedir}/../console/src/main/resources/logback.xml"
todir="${basedir}/src/main/resources/archetype-resources/console/src/main/resources" overwrite="true"
/>
-                    <copy file="${basedir}/../console/src/main/webapp/WEB-INF/web.xml"
todir="${basedir}/src/main/resources/archetype-resources/console/src/main/webapp/WEB-INF"
overwrite="true" />
-                  </then>
-                  <else>
-                    <get src="${SVNRepoURL}/core/src/test/resources/persistence.properties"
dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/persistence.properties"
/>
-                    <get src="${SVNRepoURL}/core/src/test/resources/workflow.properties"
dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/workflow.properties"
/>
-                    <get src="${SVNRepoURL}/core/src/test/resources/content.xml" dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/content.xml"
/>
-                    <get src="${SVNRepoURL}/core/src/test/resources/test.csv" dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/test.csv"
/>
-                    <get src="${SVNRepoURL}/core/src/test/resources/db.jsp" dest="${basedir}/src/main/resources/archetype-resources/core/src/test/resources/db.jsp"
/>
-
-                    <get src="${SVNRepoURL}/core/src/main/resources/persistence.properties"
dest="${basedir}/src/main/resources/archetype-resources/core/src/main/resources/persistence.properties"
/>
-                    <get src="${SVNRepoURL}/core/src/main/resources/workflow.properties"
dest="${basedir}/src/main/resources/archetype-resources/core/src/main/resources/workflow.properties"
/>
-                    <get src="${SVNRepoURL}/core/src/main/resources/security.properties"
dest="${basedir}/src/main/resources/archetype-resources/core/src/main/resources/security.properties"
/>
-                    <get src="${SVNRepoURL}/core/src/main/resources/content.xml" dest="${basedir}/src/main/resources/archetype-resources/core/src/main/resources/content.xml"
/>
-                    <get src="${SVNRepoURL}/core/src/main/resources/logback.xml" dest="${basedir}/src/main/resources/archetype-resources/core/src/main/resources/logback.xml"
/>
-                    <get src="${SVNRepoURL}/core/src/main/resources/META-INF/spring-persistence.xml"
dest="${basedir}/src/main/resources/archetype-resources/core/src/main/resources/META-INF/spring-persistence.xml"
/>
-                    <get src="${SVNRepoURL}/core/src/main/webapp/WEB-INF/web.xml" dest="${basedir}/src/main/resources/archetype-resources/core/src/main/webapp/WEB-INF/web.xml"
/>
-
-                    <get src="${SVNRepoURL}/console/src/test/resources/configuration.properties"
dest="${basedir}/src/main/resources/archetype-resources/console/src/test/resources/configuration.properties"
/>
-
-                    <get src="${SVNRepoURL}/console/src/main/resources/configuration.properties"
dest="${basedir}/src/main/resources/archetype-resources/console/src/main/resources/configuration.properties"
/>
-                    <get src="${SVNRepoURL}/console/src/main/resources/logback.xml" dest="${basedir}/src/main/resources/archetype-resources/console/src/main/resources/logback.xml"
/>
-                    <get src="${SVNRepoURL}/console/src/main/webapp/WEB-INF/web.xml" dest="${basedir}/src/main/resources/archetype-resources/console/src/main/webapp/WEB-INF/web.xml"
/>
-                  </else>
-                </if>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>ant-contrib</groupId>
-            <artifactId>ant-contrib</artifactId>
-            <version>20020829</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
       <plugin>
@@ -212,6 +129,55 @@ under the License.
           <include>NOTICE</include>
         </includes>
       </resource>
+      
+      <resource>
+        <directory>../core/src/main/resources</directory>
+        <targetPath>${project.build.outputDirectory}/archetype-resources/core/src/main/resources</targetPath>
+        <includes>
+          <include>*.properties</include>
+          <include>*.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>../core/src/main/resources/META-INF</directory>
+        <targetPath>${project.build.outputDirectory}/archetype-resources/core/src/main/resources/META-INF</targetPath>
+        <includes>
+          <include>spring-persistence.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>../core/src/main/webapp</directory>
+        <targetPath>${project.build.outputDirectory}/archetype-resources/core/src/main/webapp</targetPath>
+      </resource>
+      <resource>
+        <directory>../core/src/test/resources</directory>
+        <targetPath>${project.build.outputDirectory}/archetype-resources/core/src/test/resources</targetPath>
+        <includes>
+          <include>*.properties</include>
+          <include>content.xml</include>
+          <include>*.csv</include>
+          <include>*.jsp</include>
+        </includes>
+      </resource>
+
+      <resource>
+        <directory>../console/src/main/resources</directory>
+        <targetPath>${project.build.outputDirectory}/archetype-resources/console/src/main/resources</targetPath>
+        <includes>
+          <include>*.*</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>../console/src/main/webapp/WEB-INF</directory>
+        <targetPath>${project.build.outputDirectory}/archetype-resources/console/src/main/webapp/WEB-INF</targetPath>
+      </resource>
+      <resource>
+        <directory>../console/src/test/resources</directory>
+        <targetPath>${project.build.outputDirectory}/archetype-resources/console/src/test/resources</targetPath>
+        <includes>
+          <include>configuration.properties</include>
+        </includes>
+      </resource>
     </resources>
   </build>
 </project>

Modified: syncope/trunk/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1442055&r1=1442054&r2=1442055&view=diff
==============================================================================
--- syncope/trunk/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ syncope/trunk/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Mon Feb
 4 09:37:59 2013
@@ -27,26 +27,26 @@ under the License.
   <modules>
     <module id="core" dir="core" name="core">
       <fileSets>
-        <fileSet filtered="true" encoding="UTF-8">
+        <fileSet filtered="false" encoding="UTF-8">
           <directory>src/main/resources</directory>
         </fileSet>
-        <fileSet filtered="true" encoding="UTF-8">
+        <fileSet filtered="false" encoding="UTF-8">
           <directory>src/main/webapp</directory>
         </fileSet>
-        <fileSet filtered="true" encoding="UTF-8">
+        <fileSet filtered="false" encoding="UTF-8">
           <directory>src/test/resources</directory>
         </fileSet>
       </fileSets>
     </module>
     <module id="console" dir="console" name="console">
       <fileSets>
-        <fileSet filtered="true" encoding="UTF-8">
+        <fileSet filtered="false" encoding="UTF-8">
           <directory>src/main/resources</directory>
         </fileSet>
-        <fileSet filtered="true" encoding="UTF-8">
+        <fileSet filtered="false" encoding="UTF-8">
           <directory>src/main/webapp</directory>
         </fileSet>
-        <fileSet filtered="true" encoding="UTF-8">
+        <fileSet filtered="false" encoding="UTF-8">
           <directory>src/test/resources</directory>
         </fileSet>
       </fileSets>

Modified: syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1442055&r1=1442054&r2=1442055&view=diff
==============================================================================
--- syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml (original)
+++ syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml Mon Feb
 4 09:37:59 2013
@@ -151,6 +151,7 @@ under the License.
             <configuration>
               <source>
                 project.properties['urlencoded.csvdir.path'] = java.net.URLEncoder.encode(project.properties['test.csvdir.path'])
+                project.properties['licenseUrl'] = project.parent.licenses[0].url
               </source>
             </configuration>
           </execution>



Mime
View raw message