Author: rwesten
Date: Fri Feb 8 13:11:22 2013
New Revision: 1444001
URL: http://svn.apache.org/r1444001
Log:
STANBOL-918: removed Embedded dependencies for
* cmsadapter.core has no longer embedded dependencies
* commons.solr.core does no longer embed velocity
* commons.web does only embed freemarker; removed jettyson and jackson-core-asl
* enhancer.benchmark does no longer embed velocity
* enhancer.engines.htmlextractor has no longer jsoup embedded
* enhancer.engines.topic.web does no longer embed javax.mail
* enhancer.benchmark
* removed velocity dependency
* adapted template loading to work if velocity is not embedded in the same
bundle
* also fixed SecurityManager related issues with the new template loading
* enhancer.jersey does no longer embed dependencies
* added org.apache.velocity and javax.mail bundles to the stanbolcommons bundle
list
* added Jsoup to the enhancer bundle list
STANBOL-915: removed unused dependencies for contenthub.web
Other changes
* added sun.security.util to framework fragment (somehow required by the
javax.mail bundle)
* removed all empty <embed-depencency> elements
* some formatting corrections to pom.xml files
* added some missing svn:ignore
Modified:
stanbol/trunk/cmsadapter/core/pom.xml
stanbol/trunk/commons/frameworkfragment/pom.xml
stanbol/trunk/commons/solr/core/pom.xml
stanbol/trunk/commons/solr/extras/paoding/pom.xml
stanbol/trunk/commons/solr/extras/smartcn/pom.xml
stanbol/trunk/commons/solr/extras/stempel/pom.xml
stanbol/trunk/commons/solr/install/pom.xml
stanbol/trunk/commons/solr/web/pom.xml
stanbol/trunk/commons/web/base/pom.xml
stanbol/trunk/contenthub/ldpath/pom.xml
stanbol/trunk/contenthub/search/featured/pom.xml
stanbol/trunk/contenthub/search/related/pom.xml
stanbol/trunk/contenthub/search/solr/pom.xml
stanbol/trunk/contenthub/servicesapi/pom.xml
stanbol/trunk/contenthub/store/clerezza/pom.xml
stanbol/trunk/contenthub/store/inmemory/pom.xml
stanbol/trunk/contenthub/web/pom.xml
stanbol/trunk/enhancement-engines/htmlextractor/pom.xml
stanbol/trunk/enhancement-engines/langdetect/pom.xml
stanbol/trunk/enhancement-engines/topic/engine/ (props changed)
stanbol/trunk/enhancement-engines/topic/web/pom.xml
stanbol/trunk/enhancer/benchmark/pom.xml
stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java
stanbol/trunk/enhancer/generic/nlp-json/pom.xml
stanbol/trunk/enhancer/generic/nlp/pom.xml
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/enhancer/ldpath/pom.xml
stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/launchers/full/ (props changed)
stanbol/trunk/launchers/stable/ (props changed)
stanbol/trunk/launchers/stable/pom.xml
stanbol/trunk/parent/pom.xml
Modified: stanbol/trunk/cmsadapter/core/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/cmsadapter/core/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/cmsadapter/core/pom.xml (original)
+++ stanbol/trunk/cmsadapter/core/pom.xml Fri Feb 8 13:11:22 2013
@@ -35,8 +35,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Embed-Dependency>commons-collections</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
+ <!-- Embed-Dependency>commons-collections</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive -->
</instructions>
</configuration>
<extensions>true</extensions>
Modified: stanbol/trunk/commons/frameworkfragment/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/frameworkfragment/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/commons/frameworkfragment/pom.xml (original)
+++ stanbol/trunk/commons/frameworkfragment/pom.xml Fri Feb 8 13:11:22 2013
@@ -278,7 +278,8 @@
org.xml.sax,
org.xml.sax.ext,
org.xml.sax.helpers,
- sun.misc
+ sun.misc,
+ sun.security.util
</Export-Package>
</manifestEntries>
</archive>
Modified: stanbol/trunk/commons/solr/core/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/core/pom.xml (original)
+++ stanbol/trunk/commons/solr/core/pom.xml Fri Feb 8 13:11:22 2013
@@ -156,8 +156,7 @@
solr-analysis-extras, commons-httpclient,
lucene-core, lucene-analyzers, lucene-highlighter, lucene-memory,
lucene-spatial, lucene-spellchecker, lucene-misc, lucene-queries,
- lucene-icu, lucene-phonetic, lucene-grouping,
- velocity, velocity-tools
+ lucene-icu, lucene-phonetic, lucene-grouping
</Embed-Dependency>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/solr/extras/paoding/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/extras/paoding/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/extras/paoding/pom.xml (original)
+++ stanbol/trunk/commons/solr/extras/paoding/pom.xml Fri Feb 8 13:11:22 2013
@@ -55,8 +55,8 @@
<Bundle-Activator>
org.apache.stanbol.commons.solr.extras.paoding.Activator
</Bundle-Activator>
- <Embed-Dependency>paoding-analysis</Embed-Dependency>
- <Import-Package>*</Import-Package>
+ <!-- Embed-Dependency>paoding-analysis</Embed-Dependency>
+ <Import-Package>*</Import-Package -->
<!--
For now export all paoding packages.This might however change
-->
Modified: stanbol/trunk/commons/solr/extras/smartcn/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/extras/smartcn/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/extras/smartcn/pom.xml (original)
+++ stanbol/trunk/commons/solr/extras/smartcn/pom.xml Fri Feb 8 13:11:22 2013
@@ -50,8 +50,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Embed-Dependency>lucene-smartcn</Embed-Dependency>
-
<Import-Package>*</Import-Package>
+ <Embed-Dependency>lucene-smartcn</Embed-Dependency>
+ <Import-Package>*</Import-Package>
<!-- used instead of Export-Package to preserve the jars -->
<_exportcontents>
org.apache.lucene.analysis.cn.smart;version=3.6.1,
Modified: stanbol/trunk/commons/solr/extras/stempel/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/extras/stempel/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/extras/stempel/pom.xml (original)
+++ stanbol/trunk/commons/solr/extras/stempel/pom.xml Fri Feb 8 13:11:22 2013
@@ -50,8 +50,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Embed-Dependency>lucene-stempel</Embed-Dependency>
-
<Import-Package>*</Import-Package>
+ <Embed-Dependency>lucene-stempel</Embed-Dependency>
+ <Import-Package>*</Import-Package>
<!-- used instead of Export-Package to preserve the jars -->
<_exportcontents>
org.apache.lucene.analysis.pl;version=3.6.1,
Modified: stanbol/trunk/commons/solr/install/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/install/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/install/pom.xml (original)
+++ stanbol/trunk/commons/solr/install/pom.xml Fri Feb 8 13:11:22 2013
@@ -70,8 +70,6 @@
<Private-Package>
org.apache.stanbol.commons.solr.install.impl;version=${project.version}
</Private-Package>
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/commons/solr/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/web/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/web/pom.xml (original)
+++ stanbol/trunk/commons/solr/web/pom.xml Fri Feb 8 13:11:22 2013
@@ -67,8 +67,6 @@
org.apache.stanbol.commons.solr.web.impl;version=${project.version},
org.apache.stanbol.commons.solr.web.utils;version=${project.version}
</Private-Package>
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/commons/web/base/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/pom.xml (original)
+++ stanbol/trunk/commons/web/base/pom.xml Fri Feb 8 13:11:22 2013
@@ -73,8 +73,8 @@
freemarker.template.*;version=${freemarker-version},
freemarker.core;version=${freemarker-version}
</_exportcontents>
-
<Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jettison|jackson-core-asl
- </Embed-Dependency>
+ <!--
Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jettison|jackson-core-asl
+ </Embed-Dependency -->
<Embed-Dependency>freemarker</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
Modified: stanbol/trunk/contenthub/ldpath/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/ldpath/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/contenthub/ldpath/pom.xml (original)
+++ stanbol/trunk/contenthub/ldpath/pom.xml Fri Feb 8 13:11:22 2013
@@ -49,8 +49,6 @@
<Private-Package>
org.apache.stanbol.contenthub.ldpath.solr,
</Private-Package>
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/contenthub/search/featured/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/search/featured/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/contenthub/search/featured/pom.xml (original)
+++ stanbol/trunk/contenthub/search/featured/pom.xml Fri Feb 8 13:11:22 2013
@@ -43,8 +43,6 @@
org.apache.stanbol.contenthub.search.featured,
org.apache.stanbol.contenthub.search.featured.util
</Export-Package>
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/contenthub/search/related/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/search/related/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/contenthub/search/related/pom.xml (original)
+++ stanbol/trunk/contenthub/search/related/pom.xml Fri Feb 8 13:11:22 2013
@@ -48,8 +48,6 @@
org.apache.stanbol.contenthub.search.related.ontologyresource,
org.apache.stanbol.contenthub.search.related.referencedsite
</Private-Package>
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/contenthub/search/solr/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/search/solr/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/contenthub/search/solr/pom.xml (original)
+++ stanbol/trunk/contenthub/search/solr/pom.xml Fri Feb 8 13:11:22 2013
@@ -43,8 +43,6 @@
org.apache.stanbol.contenthub.search.solr,
org.apache.stanbol.contenthub.search.solr.util
</Export-Package>
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/contenthub/servicesapi/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/servicesapi/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/contenthub/servicesapi/pom.xml (original)
+++ stanbol/trunk/contenthub/servicesapi/pom.xml Fri Feb 8 13:11:22 2013
@@ -38,8 +38,6 @@
org.apache.stanbol.contenthub.servicesapi;version=${project.version},
org.apache.stanbol.contenthub.servicesapi.*;version=${project.version}
</Export-Package>
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/contenthub/store/clerezza/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/store/clerezza/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/contenthub/store/clerezza/pom.xml (original)
+++ stanbol/trunk/contenthub/store/clerezza/pom.xml Fri Feb 8 13:11:22 2013
@@ -80,10 +80,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- </dependency>
+ </dependency -->
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -105,9 +105,9 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
- </dependency>
+ </dependency -->
</dependencies>
</project>
Modified: stanbol/trunk/contenthub/store/inmemory/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/store/inmemory/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/contenthub/store/inmemory/pom.xml (original)
+++ stanbol/trunk/contenthub/store/inmemory/pom.xml Fri Feb 8 13:11:22 2013
@@ -44,8 +44,6 @@
<Private-Package>
org.apache.stanbol.contenthub.store.inmemory
</Private-Package>
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/contenthub/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/contenthub/web/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/contenthub/web/pom.xml (original)
+++ stanbol/trunk/contenthub/web/pom.xml Fri Feb 8 13:11:22 2013
@@ -98,9 +98,14 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.solr.core</artifactId>
+ <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
<version>0.11.0</version>
</dependency>
+ <!-- dependency> - anyway provided by commons.solr.managed
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.solr.core</artifactId>
+ <version>0.11.0</version>
+ </dependency -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
@@ -118,18 +123,13 @@
</dependency>
<!-- needed for the ContentItem resource -->
- <dependency>
+ <!-- dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- </dependency>
+ </dependency -->
<!-- Jersey -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
- <version>0.11.0</version>
- </dependency>
- <dependency>
+ <!-- dependency> - anyway defined via commons.web.base
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
@@ -149,14 +149,14 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- </dependency>
+ </dependency -->
<!-- generic tax -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -164,6 +164,10 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </dependency -->
<!-- OSGi tax -->
<dependency>
@@ -179,15 +183,11 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <dependency>
+ <!-- dependency> - anyway provided by the commons.solr dependencies
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
- </dependency>
+ </dependency -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </dependency>
<!-- for tests -->
<dependency>
<groupId>junit</groupId>
Modified: stanbol/trunk/enhancement-engines/htmlextractor/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/htmlextractor/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/htmlextractor/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/htmlextractor/pom.xml Fri Feb 8 13:11:22
2013
@@ -62,9 +62,6 @@
<Private-Package>
org.apache.stanbol.enhancer.engines.htmlextractor.*
</Private-Package>
- <Embed-Dependency>
- jsoup;scope=compile
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -143,10 +140,9 @@
<artifactId>icu4j</artifactId>
</dependency>
<dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- <version>1.7.1</version>
- </dependency>
- </dependencies>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: stanbol/trunk/enhancement-engines/langdetect/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/langdetect/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/langdetect/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/langdetect/pom.xml Fri Feb 8 13:11:22
2013
@@ -48,50 +48,50 @@
<url>http://stanbol.apache.org/</url>
</scm>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Private-Package>
-
org.apache.stanbol.enhancer.engines.langdetect;version=${project.version}
- </Private-Package>
- <Embed-Dependency>
-
langdetect;scope=compile,jsonic;scope=compile
- </Embed-Dependency>
-
<Embed-Transitive>true</Embed-Transitive>
- <Import-Package>
- !com.google.inject.*,
- !org.seasar.framework.*,
- !org.springframework.*,
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Private-Package>
+
org.apache.stanbol.enhancer.engines.langdetect;version=${project.version}
+ </Private-Package>
+ <Embed-Dependency>
+ langdetect;scope=compile,jsonic;scope=compile
+ </Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Import-Package>
+ !com.google.inject.*,
+ !org.seasar.framework.*,
+ !org.springframework.*,
org.apache.stanbol.enhancer.servicesapi; provide:=true;
version="[0.10,0.12)",
org.apache.stanbol.enhancer.servicesapi.impl; provide:=true;
version="[0.10,0.12)",
*
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- AL20 licensed files: See
src/test/resources/README -->
-
<exclude>src/test/resources/*.txt</exclude>
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- AL20 licensed files: See src/test/resources/README -->
+ <exclude>src/test/resources/*.txt</exclude>
<exclude>src/license/THIRD-PARTY.properties</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
@@ -141,7 +141,7 @@
<version>0.10.0</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
Propchange: stanbol/trunk/enhancement-engines/topic/engine/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 8 13:11:22 2013
@@ -0,0 +1,7 @@
+.project
+
+target
+
+.classpath
+
+.settings
Modified: stanbol/trunk/enhancement-engines/topic/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/topic/web/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/topic/web/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/topic/web/pom.xml Fri Feb 8 13:11:22 2013
@@ -80,9 +80,6 @@
<Export-Package>
org.apache.stanbol.enhancer.web.topic.*;version=${project.version}
</Export-Package>
- <Embed-Dependency>
- mail
- </Embed-Dependency>
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
Modified: stanbol/trunk/enhancer/benchmark/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/benchmark/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/enhancer/benchmark/pom.xml (original)
+++ stanbol/trunk/enhancer/benchmark/pom.xml Fri Feb 8 13:11:22 2013
@@ -63,8 +63,8 @@
</Private-Package>
<!-- TODO velocity should be in its own bundle -->
- <Embed-Dependency>velocity,velocity-tools</Embed-Dependency>
- <Embed-Transitive>false</Embed-Transitive>
+ <!-- Embed-Dependency>velocity,velocity-tools</Embed-Dependency>
+ <Embed-Transitive>false</Embed-Transitive -->
<!-- Ignore Velocity stuff that we don't need -->
<Import-Package>
@@ -146,18 +146,16 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <version>2.0</version>
</dependency>
</dependencies>
</project>
Modified:
stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
---
stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java
(original)
+++
stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java
Fri Feb 8 13:11:22 2013
@@ -24,6 +24,8 @@ import java.io.StringReader;
import java.io.UnsupportedEncodingException;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
@@ -49,6 +51,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
import org.apache.velocity.tools.generic.EscapeTool;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
@@ -120,7 +123,6 @@ public class BenchmarkServlet extends Ht
if(mountPath.endsWith("/")) {
mountPath = mountPath.substring(mountPath.length() - 1);
}
-
httpService.registerServlet(mountPath, this, null, null);
log.info("Servlet mounted at {}", mountPath);
@@ -156,7 +158,7 @@ public class BenchmarkServlet extends Ht
final String path = request.getPathInfo() == null ? "" :
request.getPathInfo();
if(path.endsWith(".css")) {
// Serve our css
- final Template t = velocity.getTemplate("/velocity/benchmark.css");
+ final Template t = getTemplate("/velocity/benchmark.css");
response.setContentType("text/css");
response.setCharacterEncoding("UTF-8");
t.merge(getVelocityContext(request, null), response.getWriter());
@@ -167,7 +169,7 @@ public class BenchmarkServlet extends Ht
} else {
// Benchmark input form pre-filled with selected example
- final Template t =
velocity.getTemplate("/velocity/benchmark-input.html");
+ final Template t = getTemplate("/velocity/benchmark-input.html");
final VelocityContext ctx = getVelocityContext(request, "Benchmark
Input");
ctx.put("formAction", request.getContextPath() + mountPath);
ctx.put("benchmarkText", getBenchmarkText(path));
@@ -178,6 +180,21 @@ public class BenchmarkServlet extends Ht
t.merge(ctx, response.getWriter());
}
}
+
+ /**
+ * @return
+ */
+ private Template getTemplate(String templatePath) {
+ final Template t;
+ ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+
Thread.currentThread().setContextClassLoader(BenchmarkServlet.class.getClassLoader());
+ try {
+ t = velocity.getTemplate(templatePath);
+ } finally {
+ Thread.currentThread().setContextClassLoader(tcl);
+ }
+ return t;
+ }
private String getExampleBenchmarkPath(HttpServletRequest request, String
name) {
return request.getContextPath() + mountPath + "/" + name;
@@ -209,7 +226,7 @@ public class BenchmarkServlet extends Ht
}
@Override
- protected void doPost(HttpServletRequest request, HttpServletResponse
response)
+ protected void doPost(final HttpServletRequest request, final
HttpServletResponse response)
throws ServletException, IOException {
final String content = request.getParameter(PARAM_CONTENT);
if(content == null) {
@@ -219,7 +236,7 @@ public class BenchmarkServlet extends Ht
final Template t = AccessController.doPrivileged(new
PrivilegedAction<Template>() {
@Override
public Template run() {
- return
velocity.getTemplate("/velocity/benchmark-results.html");
+ return getTemplate("/velocity/benchmark-results.html");
}
});
final VelocityContext ctx = getVelocityContext(request, "Benchmark
Results");
@@ -245,6 +262,22 @@ public class BenchmarkServlet extends Ht
response.setContentType("text/html");
response.setCharacterEncoding("UTF-8");
- t.merge(ctx, response.getWriter());
+ try {
+ AccessController.doPrivileged(new
PrivilegedExceptionAction<Object>() {
+ @Override
+ public Object run() throws IOException{
+ t.merge(ctx, response.getWriter());
+ return null;
+ }
+ });
+ } catch (PrivilegedActionException pae) {
+ Exception e = pae.getException();
+ if(e instanceof IOException){
+ throw (IOException)e;
+ } else {
+ throw RuntimeException.class.cast(e);
+ }
+
+ }
}
}
\ No newline at end of file
Modified: stanbol/trunk/enhancer/generic/nlp-json/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/nlp-json/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/nlp-json/pom.xml Fri Feb 8 13:11:22 2013
@@ -58,7 +58,6 @@
<Private-Package>
org.apache.stanbol.enhancer.nlp.json.valuetype.impl;version=${project.version}
</Private-Package>
- <Embed-Dependency></Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancer/generic/nlp/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/nlp/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/nlp/pom.xml Fri Feb 8 13:11:22 2013
@@ -72,7 +72,6 @@
<Private-Package>
org.apache.stanbol.enhancer.nlp.model.impl.*;version=${project.version}
</Private-Package>
- <Embed-Dependency></Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Fri Feb 8 13:11:22 2013
@@ -58,10 +58,10 @@
<Export-Package>
org.apache.stanbol.enhancer.jersey.*
</Export-Package>
- <Embed-Dependency>
+ <!-- Embed-Dependency>
*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl|httpmime
</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
+ <Embed-Transitive>true</Embed-Transitive -->
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
Modified: stanbol/trunk/enhancer/ldpath/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/ldpath/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/enhancer/ldpath/pom.xml (original)
+++ stanbol/trunk/enhancer/ldpath/pom.xml Fri Feb 8 13:11:22 2013
@@ -63,11 +63,6 @@
<Export-Package>
org.apache.stanbol.enhancer.ldpath.*
</Export-Package>
- <!--
- <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=
- </Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- -->
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml
(original)
+++ stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml Fri
Feb 8 13:11:22 2013
@@ -21,6 +21,15 @@
start level 10 TO 19 reserved for required libraries (internal and
external)
********************************************************************* -->
+ <!-- JSoup is used by the HTML extractor -->
+ <startLevel level="20">
+ <bundle>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.7.2</version>
+ </bundle>
+ </startLevel>
+
<!-- Apache Tika -->
<!-- Note: that Tika only inits the Parser correctly if the start level of
tika-core is lower than tika-bundle
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=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
---
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
(original)
+++
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Fri Feb 8 13:11:22 2013
@@ -189,6 +189,22 @@
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.12</version>
</bundle>
+ <!-- Velocity -->
+ <bundle>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.velocity-tools</artifactId>
+ <version>2.0_1</version>
+ </bundle>
+ <bundle>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.5</version>
+ </bundle>
</startLevel>
<!-- Jersey -->
<startLevel level="24">
Propchange: stanbol/trunk/launchers/full/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 8 13:11:22 2013
@@ -7,3 +7,5 @@ factstore
RuleConf
stanbol
.pom.xml.swp
+
+dependency-reduced-pom.xml
Propchange: stanbol/trunk/launchers/stable/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 8 13:11:22 2013
@@ -6,3 +6,5 @@ target
target/
sling
stanbol
+
+dependency-reduced-pom.xml
Modified: stanbol/trunk/launchers/stable/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/pom.xml (original)
+++ stanbol/trunk/launchers/stable/pom.xml Fri Feb 8 13:11:22 2013
@@ -118,9 +118,6 @@
<include>org.apache.sling:org.apache.sling.launchpad.base</include>
</includes>
</artifactSet>
- <!-- transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
- </transformers -->
</configuration>
</execution>
</executions>
@@ -147,7 +144,6 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.base</artifactId>
<classifier>app</classifier>
- <scope>provided</scope>
</dependency>
<!-- OSGi Framemework Bundle List -->
Modified: stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1444001&r1=1444000&r2=1444001&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Fri Feb 8 13:11:22 2013
@@ -739,6 +739,32 @@
<version>1.6.2</version>
</dependency>
+ <!-- Javax Mail -->
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.5</version>
+ </dependency>
+
+ <!-- Jsoup -->
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.7.2</version>
+ </dependency>
+
+ <!-- Velocity -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools</artifactId>
+ <version>2.0</version>
+ </dependency>
+
<!-- SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -1116,16 +1142,6 @@
<artifactId>portlet-api</artifactId>
<version>2.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>2.0</version>
- </dependency>
<!-- END Solr/Lucene dependencies -->
<!-- JDom -->
