You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2013/02/14 12:27:12 UTC
svn commit: r1446124 - in /stanbol/trunk/commons: freemarker/pom.xml
web/base/pom.xml
web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java
web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
Author: reto
Date: Thu Feb 14 11:27:11 2013
New Revision: 1446124
URL: http://svn.apache.org/r1446124
Log:
STANBO-933: Moved freemarker from web.base to freemarker project. web.base no longer depend on freemarker.
Modified:
stanbol/trunk/commons/freemarker/pom.xml
stanbol/trunk/commons/web/base/pom.xml
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
Modified: stanbol/trunk/commons/freemarker/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/freemarker/pom.xml?rev=1446124&r1=1446123&r2=1446124&view=diff
==============================================================================
--- stanbol/trunk/commons/freemarker/pom.xml (original)
+++ stanbol/trunk/commons/freemarker/pom.xml Thu Feb 14 11:27:11 2013
@@ -54,6 +54,35 @@ from the bundles. More Freemarker utilit
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>freemarker</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Export-Package>freemarker.*</Export-Package>
+ <Import-Package>
+ !javax.servlet.jsp.*,
+ !org.apache.tools.*,
+ !org.mortbay.*,
+ !org.apache.xpath.*,
+ !org.jdom.*,
+ !org.jaxen.*,
+ !org.apache.xml.*,
+ !org.mozilla.javascript.*,
+ !org.python.*,
+ !org.dom4j.*,
+ !org.apache.log.*,
+ !com.sun.org.apache.*,
+ !javax.el,
+ !org.slf4j.spi,
+ !org.zeroturnaround.javarebel,
+ javax.servlet.*; version="[2.5.0,4.0.0)",
+ javax.ws.rs;version="[0,2)",
+ javax.ws.rs.ext;version="[0,2)",
+ javax.ws.rs.core;version="[0,2)",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: stanbol/trunk/commons/web/base/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/pom.xml?rev=1446124&r1=1446123&r2=1446124&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/pom.xml (original)
+++ stanbol/trunk/commons/web/base/pom.xml Thu Feb 14 11:27:11 2013
@@ -68,31 +68,7 @@
org.apache.stanbol.commons.web.base;version=${project.version},
org.apache.stanbol.commons.web.base.*;version=${project.version}
</Export-Package>
- <_exportcontents> <!-- used instead of Export-Package to preserve the embedded jar -->
- freemarker.cache;version=${freemarker-version},
- 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>freemarker</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
<Import-Package>
- !javax.servlet.jsp.*,
- !org.apache.tools.*,
- !org.mortbay.*,
- !org.apache.xpath.*,
- !org.jdom.*,
- !org.jaxen.*,
- !org.apache.xml.*,
- !org.mozilla.javascript.*,
- !org.python.*,
- !org.dom4j.*,
- !org.apache.log.*,
- !com.sun.org.apache.*,
- !javax.el,
- !org.slf4j.spi,
- !org.zeroturnaround.javarebel,
javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs;version="[0,2)",
javax.ws.rs.ext;version="[0,2)",
@@ -103,10 +79,6 @@
org.apache.stanbol.commons.web.base.resource,
org.apache.stanbol.commons.web.base.utils,
org.apache.stanbol.commons.web.base.writers,
- freemarker.cache,
- freemarker.template,
- freemarker.template.utility,
- freemarker.core,
*
</Import-Package>
</instructions>
@@ -129,10 +101,6 @@
</dependency>
<dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </dependency>
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
Modified: stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java?rev=1446124&r1=1446123&r2=1446124&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java (original)
+++ stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/DefaultApplication.java Thu Feb 14 11:27:11 2013
@@ -29,8 +29,6 @@ import org.apache.stanbol.commons.web.ba
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import freemarker.cache.MultiTemplateLoader;
-import freemarker.cache.TemplateLoader;
/**
* Define the list of available resources and providers to be used by the Stanbol JAX-RS Endpoint.
@@ -44,7 +42,6 @@ public class DefaultApplication extends
protected final Set<Object> contributedSingletons = new HashSet<Object>();
- protected List<TemplateLoader> templateLoaders = new ArrayList<TemplateLoader>();
@Override
public Set<Class<?>> getClasses() {
@@ -63,10 +60,6 @@ public class DefaultApplication extends
public Set<Object> getSingletons() {
Set<Object> singletons = new HashSet<Object>();
singletons.addAll(contributedSingletons);
-
- TemplateLoader[] loadersArray = templateLoaders.toArray(new TemplateLoader[templateLoaders.size()]);
- MultiTemplateLoader templateLoader = new MultiTemplateLoader(loadersArray);
- //singletons.add(new FreemarkerViewProcessor(templateLoader));
return singletons;
}
@@ -78,9 +71,4 @@ public class DefaultApplication extends
contributedSingletons.addAll(singletons);
}
- public void contributeTemplateLoader(TemplateLoader templateLoader) {
- if (templateLoader != null) {
- this.templateLoaders.add(templateLoader);
- }
- }
}
Modified: stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java?rev=1446124&r1=1446123&r2=1446124&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java (original)
+++ stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java Thu Feb 14 11:27:11 2013
@@ -19,9 +19,6 @@ package org.apache.stanbol.commons.web.b
import java.util.List;
import java.util.Set;
-import org.osgi.framework.BundleContext;
-
-import freemarker.cache.TemplateLoader;
/**
* Interface to be implemented by bundles that want to customize the stanbol web interface and REST API by