[plexus-resources] 07/24: fixed misbehaving pathes

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-resources.

commit 155db326248a72ca4fda3642834564eea2d18994
Author: Eugene Zhukov <eugene at debian.org>
Date:   Tue May 21 18:46:06 2013 +0000

    fixed misbehaving pathes
---
 debian/control                        |   2 +-
 debian/patches/config_resources.patch |  57 -------------------
 debian/patches/pom_fixes.patch        | 101 ++++++++++++++++++++++++++++++----
 debian/patches/series                 |   1 -
 4 files changed, 90 insertions(+), 71 deletions(-)

diff --git a/debian/control b/debian/control
index 4251d97..837fd7b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Eugene Zhukov <jevgeni.zh at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.6.1)
+Build-Depends: debhelper (>= 8), cdbs, default-jdk, maven-debian-helper (>= 1.6.1)
 Build-Depends-Indep: libplexus-containers1.5-java (>= 1.5.5), libplexus-utils-java 
 Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-resources
diff --git a/debian/patches/config_resources.patch b/debian/patches/config_resources.patch
deleted file mode 100644
index 4a14c86..0000000
--- a/debian/patches/config_resources.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: resource config
-  * resource configuration from parent project
-Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: <2013-05-16>
-
---- /dev/null
-+++ plexus-resources-1.0~alpha7/src/main/config/plexus/components.xml
-@@ -0,0 +1,49 @@
-+<component-set>
-+  <components>
-+    <component>
-+      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-+      <role-hint>url</role-hint>
-+      <implementation>org.codehaus.plexus.resource.loader.URLResourceLoader</implementation>
-+      <instantiation-strategy>per-lookup</instantiation-strategy>
-+      <description></description>
-+      <isolated-realm>false</isolated-realm>
-+    </component>
-+    <component>
-+      <role>org.codehaus.plexus.resource.ResourceManager</role>
-+      <role-hint>default</role-hint>
-+      <implementation>org.codehaus.plexus.resource.DefaultResourceManager</implementation>
-+      <instantiation-strategy>per-lookup</instantiation-strategy>
-+      <description></description>
-+      <isolated-realm>false</isolated-realm>
-+      <requirements>
-+        <requirement>
-+          <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-+          <field-name>resourceLoaders</field-name>
-+        </requirement>
-+      </requirements>
-+    </component>
-+    <component>
-+      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-+      <role-hint>jar</role-hint>
-+      <implementation>org.codehaus.plexus.resource.loader.JarResourceLoader</implementation>
-+      <instantiation-strategy>per-lookup</instantiation-strategy>
-+      <description></description>
-+      <isolated-realm>false</isolated-realm>
-+    </component>
-+    <component>
-+      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-+      <role-hint>classloader</role-hint>
-+      <implementation>org.codehaus.plexus.resource.loader.ThreadContextClasspathResourceLoader</implementation>
-+      <description></description>
-+      <isolated-realm>false</isolated-realm>
-+    </component>
-+    <component>
-+      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
-+      <role-hint>file</role-hint>
-+      <implementation>org.codehaus.plexus.resource.loader.FileResourceLoader</implementation>
-+      <instantiation-strategy>per-lookup</instantiation-strategy>
-+      <description></description>
-+      <isolated-realm>false</isolated-realm>
-+    </component>
-+  </components>
-+</component-set>
diff --git a/debian/patches/pom_fixes.patch b/debian/patches/pom_fixes.patch
index 7b1fed7..05900b6 100644
--- a/debian/patches/pom_fixes.patch
+++ b/debian/patches/pom_fixes.patch
@@ -1,24 +1,102 @@
 Description: classpath and parent project config
-  * configuration from parent project
-  * adds classpath to MANIFEST.MF
+ * configuration from parent project
+ * maven-jar-plugin adds Class-Path to MANIFEST.MF
 Author: Eugene Zhukov <jevgeni.zh at gmail.com>
-Last-Update: <2013-05-16>
+Last-Update: <2013-05-21>
 
---- plexus-resources-1.0~alpha7.orig/pom.xml
-+++ plexus-resources-1.0~alpha7/pom.xml
-@@ -30,4 +30,28 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -20,6 +20,10 @@
+     <url>http://fisheye.codehaus.org/browse/plexus/plexus-components/tags/plexus-resources-1.0-alpha-7</url>
+   </scm>
+ 
++  <properties>
++    <configs.path>target/config</configs.path>
++  </properties>
++
+   <dependencies>
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+@@ -30,4 +34,94 @@
        <artifactId>plexus-container-default</artifactId>
      </dependency>
    </dependencies>
 +
 +  <build>
 +    <resources>
-+      <resource>
-+        <directory>src/main/config</directory>
-+        <targetPath>META-INF</targetPath>
-+      </resource>
++        <resource>
++                <directory>${configs.path}</directory>
++                <targetPath>META-INF</targetPath>
++        </resource>
 +    </resources>
 +    <plugins>
++        <plugin>
++        <artifactId>maven-antrun-plugin</artifactId>
++        <version>1.6</version>
++        <executions>
++          <execution>
++            <phase>generate-resources</phase>
++            <configuration>
++              <target>
++                <mkdir dir="${configs.path}/plexus"/>
++                <echo file="${configs.path}/plexus/components.xml"><![CDATA[<component-set>
++  <components>
++    <component>
++      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
++      <role-hint>url</role-hint>
++      <implementation>org.codehaus.plexus.resource.loader.URLResourceLoader</implementation>
++      <instantiation-strategy>per-lookup</instantiation-strategy>
++      <description></description>
++      <isolated-realm>false</isolated-realm>
++    </component>
++    <component>
++      <role>org.codehaus.plexus.resource.ResourceManager</role>
++      <role-hint>default</role-hint>
++      <implementation>org.codehaus.plexus.resource.DefaultResourceManager</implementation>
++      <instantiation-strategy>per-lookup</instantiation-strategy>
++      <description></description>
++      <isolated-realm>false</isolated-realm>
++      <requirements>
++        <requirement>
++          <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
++          <field-name>resourceLoaders</field-name>
++        </requirement>
++      </requirements>
++    </component>
++    <component>
++      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
++      <role-hint>jar</role-hint>
++      <implementation>org.codehaus.plexus.resource.loader.JarResourceLoader</implementation>
++      <instantiation-strategy>per-lookup</instantiation-strategy>
++      <description></description>
++      <isolated-realm>false</isolated-realm>
++    </component>
++    <component>
++      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
++      <role-hint>classloader</role-hint>
++      <implementation>org.codehaus.plexus.resource.loader.ThreadContextClasspathResourceLoader</implementation>
++      <description></description>
++      <isolated-realm>false</isolated-realm>
++    </component>
++    <component>
++      <role>org.codehaus.plexus.resource.loader.ResourceLoader</role>
++      <role-hint>file</role-hint>
++      <implementation>org.codehaus.plexus.resource.loader.FileResourceLoader</implementation>
++      <instantiation-strategy>per-lookup</instantiation-strategy>
++      <description></description>
++      <isolated-realm>false</isolated-realm>
++    </component>
++  </components>
++</component-set>]]>
++                </echo>
++              </target>
++            </configuration>
++            <goals>
++              <goal>run</goal>
++            </goals>
++          </execution>
++        </executions>
++      </plugin>
 +      <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-jar-plugin</artifactId>
@@ -30,8 +108,7 @@ Last-Update: <2013-05-16>
 +          </archive>
 +        </configuration>
 +        <version>2.2</version>
-+        </plugin>
++      </plugin>
 +    </plugins>
 +  </build>
-+
  </project>
diff --git a/debian/patches/series b/debian/patches/series
index 7300937..d1199b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-config_resources.patch
 pom_fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-resources.git