You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2012/10/01 14:30:35 UTC

svn commit: r1392304 - in /servicemix/smx4/bundles/trunk: gae-1.6.6/pom.xml pom.xml

Author: jbonofre
Date: Mon Oct  1 12:30:35 2012
New Revision: 1392304

URL: http://svn.apache.org/viewvc?rev=1392304&view=rev
Log:
[SMX4-1181] Fix GAE 1.6.6 bundle content

Modified:
    servicemix/smx4/bundles/trunk/gae-1.6.6/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/gae-1.6.6/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/gae-1.6.6/pom.xml?rev=1392304&r1=1392303&r2=1392304&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/gae-1.6.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/gae-1.6.6/pom.xml Mon Oct  1 12:30:35 2012
@@ -40,7 +40,11 @@
         <pkgVersion>1.6.6</pkgVersion>
         <servicemix.osgi.export>
             com.google.appengine.api*;version=${pkgVersion};-split-package:=merge-first,
-            com.google.apphosting.api*;version=${pkgVersion};-split-package:=merge-first
+            com.google.apphosting.api*;version=${pkgVersion};-split-package:=merge-first,
+            com.google.apphosting.base;version=${pkgVersion};-split-package:=merge-first,
+            com.google.apphosting.utils*;version=${pkgVersion};-split-package:=merge-first,
+            com.google.cloud*;version=${pkgVersion};-split-package:=merge-first,
+            com.google.appengine.labs*;version=${pkgVersion};-split-package:=merge-first
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
 
@@ -110,15 +114,20 @@
                             <filters>
                                 <filter>
                                     <artifact>${pkgGroupId}:appengine-api-1.0-sdk</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>META-INF/**/*</include>
+                                    </includes>
                                 </filter>
                                 <filter>
                                     <artifact>${pkgGroupId}:appengine-api-labs</artifact>
-                                    <excludes>
-                                        <exclude>**</exclude>
-                                    </excludes>
+                                    <includes>
+                                        <include>**/*.gif</include>
+                                        <include>**/*.css</include>
+                                        <include>**/*.js</include>
+                                        <include>**/*.html</include>
+                                        <include>**/*.so</include>
+                                        <include>**/*.xml</include>
+                                    </includes>
                                 </filter>
                             </filters>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1392304&r1=1392303&r2=1392304&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Mon Oct  1 12:30:35 2012
@@ -57,6 +57,7 @@
         <module>derby-10.8.1.2</module>
         <module>derby-10.8.2.2</module>
         <module>gae-1.7.1</module>
+        <module>gae-1.6.6</module>
     </modules>
 
 </project>