Author: rwesten
Date: Sat Feb 2 10:06:46 2013
New Revision: 1441720
URL: http://svn.apache.org/viewvc?rev=1441720&view=rev
Log:
STANBOL-888: some version upgrades to dependencies, upgraded to newest Sling
Lauchpad and lauchpad maven plugin, upgrade to maven-shade-plugin 2.0 (see also
discussion at http://stanbol.markmail.org/thread/myn32zyw6fazuub2)
Added:
stanbol/trunk/launchers/full-war/src/main/config/
stanbol/trunk/launchers/full/README.md (contents, props changed)
- copied, changed from r1441319, stanbol/trunk/launchers/full/README.txt
stanbol/trunk/launchers/full/src/main/config/
stanbol/trunk/launchers/stable/README.md
- copied, changed from r1441319, stanbol/trunk/launchers/stable/README.txt
stanbol/trunk/launchers/stable/src/main/config/
Removed:
stanbol/trunk/launchers/full/README.txt
stanbol/trunk/launchers/stable/README.txt
Modified:
stanbol/trunk/launchers/bundlelists/entityhub/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml
stanbol/trunk/launchers/full-war/src/main/bundles/list.xml
stanbol/trunk/launchers/full/pom.xml
stanbol/trunk/launchers/full/src/main/bundles/list.xml
stanbol/trunk/launchers/stable/pom.xml
Modified:
stanbol/trunk/launchers/bundlelists/entityhub/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/entityhub/src/main/bundles/list.xml?rev=1441720&r1=1441719&r2=1441720&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/entityhub/src/main/bundles/list.xml
(original)
+++ stanbol/trunk/launchers/bundlelists/entityhub/src/main/bundles/list.xml Sat
Feb 2 10:06:46 2013
@@ -64,12 +64,6 @@
<artifactId>org.apache.stanbol.entityhub.ldpath</artifactId>
<version>0.12.0-SNAPSHOT</version>
</bundle>
-<!-- <bundle>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>1.1.0</version>
- </bundle> -->
-
</startLevel>
<!-- Web Fragment -->
Modified:
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1441720&r1=1441719&r2=1441720&view=diff
==============================================================================
---
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
(original)
+++
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Sat Feb 2 10:06:46 2013
@@ -45,7 +45,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.4.2</version>
+ <version>3.4.4</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
@@ -111,7 +111,12 @@
<bundle>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.3</version>
+ <version>1.4.1</version>
+ </bundle>
+ <bundle>
+ <groupId>org.tukaani</groupId>
+ <artifactId>xz</artifactId>
+ <version>1.2</version>
</bundle>
<bundle>
<groupId>commons-codec</groupId>
@@ -131,12 +136,12 @@
<bundle>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.2.1</version>
+ <version>4.2.3</version>
</bundle>
<bundle>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.2.1</version>
+ <version>4.2.3</version>
</bundle>
<!-- bundle> Stax is included in JDK 1.6+
<groupId>org.apache.servicemix.specs</groupId>
@@ -167,22 +172,22 @@
<bundle> <!-- used for simple JSON parsing/writing in Stanbol -->
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3.1</version>
+ <version>1.3.3</version>
</bundle>
<bundle> <!-- used for stream parsing/serialization -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.9.11</version>
+ <version>1.9.12</version>
</bundle>
<bundle> <!-- JSON Tree model and JSON - Object mappings -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.11</version>
+ <version>1.9.12</version>
</bundle>
<bundle> <!-- for JAX-RS integration -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>1.9.11</version>
+ <version>1.9.12</version>
</bundle>
</startLevel>
<!-- Jersey -->
@@ -342,8 +347,8 @@
</bundle>
<!-- Namespace prefix service -->
<bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.commons.namespaceprefix.service</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.commons.namespaceprefix.service</artifactId>
<version>0.12.0-SNAPSHOT</version>
</bundle>
<bundle> <!-- Provides the Stanbol specific Prefix Mappings: Backward
compatibility -->
Modified: stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml?rev=1441720&r1=1441719&r2=1441720&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml
(original)
+++ stanbol/trunk/launchers/bundlelists/zzshell/src/main/bundles/list.xml Sat
Feb 2 10:06:46 2013
@@ -23,12 +23,12 @@
<bundle>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.scala-library</artifactId>
- <version>2.8.1_1</version>
+ <version>2.10.0_1</version>
</bundle>
<bundle>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.scala-compiler</artifactId>
- <version>2.8.1_1</version>
+ <version>2.10.0_1</version>
</bundle>
<bundle>
<groupId>org.apache.clerezza.ext</groupId>
@@ -96,12 +96,12 @@
<bundle>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.0.3</version>
+ <version>2.0.7</version>
</bundle>
<bundle>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>0.5.0</version>
+ <version>0.8.0</version>
</bundle>
</startLevel>
Modified: stanbol/trunk/launchers/full-war/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml?rev=1441720&r1=1441719&r2=1441720&view=diff
==============================================================================
--- stanbol/trunk/launchers/full-war/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/full-war/src/main/bundles/list.xml Sat Feb 2
10:06:46 2013
@@ -31,11 +31,11 @@
<artifactId>mime-util</artifactId>
<version>2.1.3</version>
</bundle>
- <bundle> <!-- only used by the Factstore -->
+<!-- <bundle> only used by the Factstore
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.7.1.1</version>
- </bundle>
+ </bundle -->
</startLevel>
<!-- Jersey -->
@@ -73,11 +73,11 @@
<startLevel level="36">
<!-- The Content-Editable based UI for Enhancing Text written on a Webpage
-->
- <bundle>
+ <!-- bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.demos.enhancer.vie</artifactId>
<version>0.10.0-SNAPSHOT</version>
- </bundle>
+ </bundle -->
</startLevel>
<!-- *********************************************************************
Copied: stanbol/trunk/launchers/full/README.md (from r1441319,
stanbol/trunk/launchers/full/README.txt)
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/README.md?p2=stanbol/trunk/launchers/full/README.md&p1=stanbol/trunk/launchers/full/README.txt&r1=1441319&r2=1441720&rev=1441720&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/README.txt (original)
+++ stanbol/trunk/launchers/full/README.md Sat Feb 2 10:06:46 2013
@@ -3,21 +3,24 @@ including the bundles defined at src/mai
To start this after building use:
- java -Xmx512M -jar
target/org.apache.stanbol.launchers.full-0.9.0-incubating-SNAPSHOT.jar
+ java -Xmx1024m -XX:MaxPermSize=256M -jar \
+ target/org.apache.stanbol.launchers.full-*-SNAPSHOT.jar
The Stanbol Enhancer HTTP endpoint should then be available at
- http://localhost:8080
+ http://localhost:8080
So that you can POST content using, for example:
- curl -H "Content-Type: text/plain" -T data/text-examples/obama-signing.txt
http://localhost:8080/engines
+ curl -H "Content-Type: text/plain" \
+ -T ../../enhancer/data/text-examples/obama-signing.txt \
+ http://localhost:8080/engines
Configure any required parameter for the enhancement engines, at
http://localhost:8080/system/console/
-The OSGi state is stored in the ./sling folder.
+The OSGi state is stored in the ./stanbol folder.
-The logs are found at sling/logs/error.log and can be configured from the
+The logs are found at stanbol/logs/error.log and can be configured from the
OSGi console.
Propchange: stanbol/trunk/launchers/full/README.md
------------------------------------------------------------------------------
svn:eol-style = native
Modified: stanbol/trunk/launchers/full/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1441720&r1=1441719&r2=1441720&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/pom.xml (original)
+++ stanbol/trunk/launchers/full/pom.xml Sat Feb 2 10:06:46 2013
@@ -102,7 +102,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.2</version>
+ <version>2.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -114,11 +114,12 @@
<!-- Use this to in/exclude only specific dependencies -->
<includes>
<include>org.apache.stanbol:org.apache.stanbol.commons.launchpad</include>
+
<include>org.apache.sling:org.apache.sling.launchpad.base</include>
</includes>
</artifactSet>
- <transformers>
+ <!-- transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
- </transformers>
+ </transformers -->
</configuration>
</execution>
</executions>
@@ -165,16 +166,16 @@
<scope>provided</scope>
</dependency>
- <!-- Security Support-->
+ <!-- Security Support -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId>
<version>0.10.0-SNAPSHOT</version>
<type>partialbundlelist</type>
<scope>provided</scope>
- </dependency>
+ </dependency>
- <!-- zz> Shell Bundle List -->
+ <!-- zz> Shell Bundle List -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.zzshell</artifactId>
@@ -262,5 +263,23 @@
<scope>provided</scope>
</dependency>
+ <!-- Language Extras -->
+ <!-- Basic Cinese language support (STANBOL-855 -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.smartcn</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.paoding</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+
+
</dependencies>
</project>
Modified: stanbol/trunk/launchers/full/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/src/main/bundles/list.xml?rev=1441720&r1=1441719&r2=1441720&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/full/src/main/bundles/list.xml Sat Feb 2 10:06:46
2013
@@ -70,11 +70,11 @@
<startLevel level="36">
<!-- The Content-Editable based UI for Enhancing Text written on a Webpage
-->
- <bundle>
+ <!-- bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.demos.enhancer.vie</artifactId>
<version>0.10.0-SNAPSHOT</version>
- </bundle>
+ </bundle -->
</startLevel>
<!-- *********************************************************************
Copied: stanbol/trunk/launchers/stable/README.md (from r1441319,
stanbol/trunk/launchers/stable/README.txt)
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/README.md?p2=stanbol/trunk/launchers/stable/README.md&p1=stanbol/trunk/launchers/stable/README.txt&r1=1441319&r2=1441720&rev=1441720&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/README.txt (original)
+++ stanbol/trunk/launchers/stable/README.md Sat Feb 2 10:06:46 2013
@@ -6,21 +6,23 @@ components.
To start this after building use:
- java -Xmx512M -jar
target/org.apache.stanbol.launchers.stable-0.9.0-incubating-SNAPSHOT.jar
+ java -Xmx512M -jar
target/org.apache.stanbol.launchers.stable-*-SNAPSHOT.jar
The Stanbol Enhancer HTTP endpoint should then be available at
- http://localhost:8080
+ http://localhost:8080
So that you can POST content using, for example:
- curl -H "Content-Type: text/plain" -T data/text-examples/obama-signing.txt
http://localhost:8080/engines
+ curl -H "Content-Type: text/plain" \
+ -T ../../enhancer/data/text-examples/obama-signing.txt \
+ http://localhost:8080/engines
Configure any required parameter for the enhancement engines, at
- http://localhost:8080/system/console/
+ http://localhost:8080/system/console/
-The OSGi state is stored in the ./sling folder.
+The OSGi state is stored in the ./stanbol folder.
-The logs are found at sling/logs/error.log and can be configured from the
+The logs are found at stanbol/logs/error.log and can be configured from the
OSGi console.
Modified: stanbol/trunk/launchers/stable/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1441720&r1=1441719&r2=1441720&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/pom.xml (original)
+++ stanbol/trunk/launchers/stable/pom.xml Sat Feb 2 10:06:46 2013
@@ -103,7 +103,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.2</version>
+ <version>2.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -115,11 +115,12 @@
<!-- Use this to in/exclude only specific dependencies -->
<includes>
<include>org.apache.stanbol:org.apache.stanbol.commons.launchpad</include>
+
<include>org.apache.sling:org.apache.sling.launchpad.base</include>
</includes>
</artifactSet>
- <transformers>
+ <!-- transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
- </transformers>
+ </transformers -->
</configuration>
</execution>
</executions>
