Skip to content

Instantly share code, notes, and snippets.

@cristcost

cristcost/gwt_and_json2014.diff

Created February 8, 2014 20:15
Show Gist options
  • Save cristcost/8889539 to your computer and use it in GitHub Desktop.
Save cristcost/8889539 to your computer and use it in GitHub Desktop.
Download ZIP
Patch to http://svn.apache.org/repos/asf/servicemix/smx4/bundles/trunk revision 1565947 for adding GWT Servlet and org.json 2014 bundles.
Raw
gwt_and_json2014.diff
Index: gwt-servlet-2.6.0/pom.xml
===================================================================
--- gwt-servlet-2.6.0/pom.xml (revision 0)
+++ gwt-servlet-2.6.0/pom.xml (working copy)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>11</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.gwt-servlet</artifactId>
+ <version>2.6.0_1-SNAPSHOT</version>
+
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+ <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
+ <properties>
+ <pkgGroupId>com.google.gwt</pkgGroupId>
+ <pkgArtifactId>gwt-servlet</pkgArtifactId>
+ <pkgVersion>2.6.0</pkgVersion>
+ <servicemix.osgi.export>
+ com.google.gwt.user.client.rpc;version=${pkgVersion};-split-package:=merge-first,
+ com.google.gwt.user.client.rpc.*;version=${pkgVersion};-split-package:=merge-first,
+ com.google.web.bindery.requestfactory.vm.impl.*;version=${pkgVersion};-split-package:=merge-first,
+ org.hibernate.validator.engine;version=${pkgVersion};-split-package:=merge-first,
+ !javax.validation,
+ !org.hibernate.validator.*,
+ !*.client.*,
+ !*.impl.*,
+ *;version=${pkgVersion};-split-package:=merge-first
+ </servicemix.osgi.export>
+ <servicemix.osgi.import.pkg>
+ javax.servlet.*,
+ javax.validation;resolution:=optional,
+ javax.validation.*;resolution:=optional,
+ org.json.*;resolution:=optional,
+ org.json;resolution:=optional,
+ <!--!com.google.gwt.*,-->
+ *;resolution:=optional
+ </servicemix.osgi.import.pkg>
+ <servicemix.osgi.private.pkg>
+ com.google.gwt.*;-split-package:=merge-first,
+ com.google.web.bindery.*;-split-package:=merge-first
+ </servicemix.osgi.private.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Index: gwt-servlet-2.6.0/src/main/resources/OSGI-INF/bundle.info
===================================================================
--- gwt-servlet-2.6.0/src/main/resources/OSGI-INF/bundle.info (revision 0)
+++ gwt-servlet-2.6.0/src/main/resources/OSGI-INF/bundle.info (working copy)
@@ -0,0 +1,13 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.description}
+
+ Original Maven URL:
+ \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.
+ GWT is used by many products at Google, including Google AdWords and Orkut. It's open source, completely free,
+ and used by thousands of developers around the world.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttp://www.gwtproject.org/\u001B[0m
Index: json-20140107/pom.xml
===================================================================
--- json-20140107/pom.xml (revision 0)
+++ json-20140107/pom.xml (working copy)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>bundles-pom</artifactId>
+ <version>11</version>
+ <relativePath>../bundles-pom/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.json</artifactId>
+ <version>20140107_1-SNAPSHOT</version>
+
+ <packaging>bundle</packaging>
+ <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+ <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+
+ <properties>
+ <pkgGroupId>org.json</pkgGroupId>
+ <pkgArtifactId>json</pkgArtifactId>
+ <pkgVersion>20140107</pkgVersion>
+ <servicemix.osgi.export.pkg>
+ org.json,
+ org.json.zip
+ </servicemix.osgi.export.pkg>
+ <servicemix.osgi.import.pkg>
+
+ </servicemix.osgi.import.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ </dependency>
+
+ <!-- sources -->
+ <dependency>
+ <groupId>${pkgGroupId}</groupId>
+ <artifactId>${pkgArtifactId}</artifactId>
+ <version>${pkgVersion}</version>
+ <classifier>sources</classifier>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${pkgGroupId}:${pkgArtifactId}</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Index: json-20140107/src/main/resources/OSGI-INF/bundle.info
===================================================================
--- json-20140107/src/main/resources/OSGI-INF/bundle.info (revision 0)
+++ json-20140107/src/main/resources/OSGI-INF/bundle.info (working copy)
@@ -0,0 +1,21 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.description}
+
+ Original Maven URL:
+ \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ JSON (JavaScript Object Notation) is a lightweight data-interchange format. It is easy for humans to read and write.
+ It is easy for machines to parse and generate. It is based on a subset of the JavaScript Programming Language,
+ Standard ECMA-262 3rd Edition - December 1999. JSON is a text format that is completely language independent
+ but uses conventions that are familiar to programmers of the C-family of languages, including C, C++, C#, Java,
+ JavaScript, Perl, Python, and many others. These properties make JSON an ideal data-interchange language.
+
+ JSON is built on two structures:
+ A collection of name/value pairs. In various languages, this is realized as an object, record, struct, dictionary,
+ hash table, keyed list, or associative array.
+ An ordered list of values. In most languages, this is realized as an array, vector, list, or sequence.
+
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mhttp://www.json.org/java/index.html\u001B[0m
Index: pom.xml
===================================================================
--- pom.xml (revision 1565947)
+++ pom.xml (working copy)
@@ -105,6 +105,8 @@
<module>derby-10.10.1.1</module>
<module>xpp3-1.1.4c</module>
<module>json-20090211</module>
+ <module>json-20140107</module>
+ <module>gwt-servlet-2.6.0</module>
</modules>
</project>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment