oltu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1356660 - in /incubator/amber/trunk: ./ oauth-2.0/oauth2-authzserver/ oauth-2.0/oauth2-client-demo/ oauth-2.0/oauth2-client/ oauth-2.0/oauth2-common/ oauth-2.0/oauth2-dynamicreg-client/ oauth-2.0/oauth2-dynamicreg-common/ oauth-2.0/oauth2-...
Date Tue, 03 Jul 2012 10:18:17 GMT
Author: simonetripodi
Date: Tue Jul  3 10:18:15 2012
New Revision: 1356660

URL: http://svn.apache.org/viewvc?rev=1356660&view=rev
Log:
fixed wrong resources management
 * global declaration of root resources was wrong
 * include src/main/resources only if really have to

Modified:
    incubator/amber/trunk/oauth-2.0/oauth2-authzserver/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-client-demo/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-client/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-common/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-client/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-common/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-server/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-httpclient4/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-integration-tests/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-resourceserver/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-rs-filter/pom.xml
    incubator/amber/trunk/oauth-2.0/oauth2-test-utils/pom.xml
    incubator/amber/trunk/pom.xml

Modified: incubator/amber/trunk/oauth-2.0/oauth2-authzserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-authzserver/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-authzserver/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-authzserver/pom.xml Tue Jul  3 10:18:15 2012
@@ -62,4 +62,18 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
 </project>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-client-demo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-client-demo/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-client-demo/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-client-demo/pom.xml Tue Jul  3 10:18:15 2012
@@ -101,6 +101,22 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+      </resource>
+
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-client/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-client/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-client/pom.xml Tue Jul  3 10:18:15 2012
@@ -50,6 +50,18 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-common/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-common/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-common/pom.xml Tue Jul  3 10:18:15 2012
@@ -45,6 +45,18 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-client/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-client/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-client/pom.xml Tue Jul  3 10:18:15 2012
@@ -49,4 +49,18 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
 </project>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-common/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-common/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-common/pom.xml Tue Jul  3 10:18:15 2012
@@ -36,4 +36,18 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
 </project>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-server/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-server/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-dynamicreg-server/pom.xml Tue Jul  3 10:18:15 2012
@@ -67,4 +67,18 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
 </project>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-httpclient4/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-httpclient4/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-httpclient4/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-httpclient4/pom.xml Tue Jul  3 10:18:15 2012
@@ -41,4 +41,18 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
 </project>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-integration-tests/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-integration-tests/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-integration-tests/pom.xml Tue Jul  3 10:18:15 2012
@@ -122,6 +122,18 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-resourceserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-resourceserver/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-resourceserver/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-resourceserver/pom.xml Tue Jul  3 10:18:15 2012
@@ -37,6 +37,18 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-rs-filter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-rs-filter/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-rs-filter/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-rs-filter/pom.xml Tue Jul  3 10:18:15 2012
@@ -43,4 +43,18 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
 </project>

Modified: incubator/amber/trunk/oauth-2.0/oauth2-test-utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/oauth-2.0/oauth2-test-utils/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/oauth-2.0/oauth2-test-utils/pom.xml (original)
+++ incubator/amber/trunk/oauth-2.0/oauth2-test-utils/pom.xml Tue Jul  3 10:18:15 2012
@@ -37,4 +37,18 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}../../</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>LICENSE</include>
+          <include>NOTICE</include>
+          <include>DISCLAIMER</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
 </project>

Modified: incubator/amber/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/amber/trunk/pom.xml?rev=1356660&r1=1356659&r2=1356660&view=diff
==============================================================================
--- incubator/amber/trunk/pom.xml (original)
+++ incubator/amber/trunk/pom.xml Tue Jul  3 10:18:15 2012
@@ -488,22 +488,6 @@
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
     </plugins>
-
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-
-      <resource>
-        <directory>${basedir}</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-          <include>DISCLAIMER</include>
-        </includes>
-      </resource>
-    </resources>
   </build>
 
   <reporting>



Mime
View raw message