Author: reto
Date: Tue Jul 16 12:01:40 2013
New Revision: 1503673
URL: http://svn.apache.org/r1503673
Log:
STANBOL-1097: changed comment in BaseStanbolResource.java as non-public classes
are not supported by freemarker. Updated versions.
Added:
stanbol/branches/commons-ng/launchers/stable/nbactions.xml
stanbol/branches/commons-ng/nbactions.xml
Modified:
stanbol/branches/commons-ng/commons/freemarker/pom.xml
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml
stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Modified: stanbol/branches/commons-ng/commons/freemarker/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/freemarker/pom.xml?rev=1503673&r1=1503672&r2=1503673&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/freemarker/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/freemarker/pom.xml Tue Jul 16 12:01:40
2013
@@ -43,7 +43,7 @@ from the bundles. More Freemarker utilit
<url>http://stanbol.apache.org/</url>
</scm>
<properties>
- <freemarker-version>2.3.19</freemarker-version>
+ <freemarker-version>2.3.20</freemarker-version>
</properties>
<build>
<!-- make it an OSGi bundle -->
Modified:
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java?rev=1503673&r1=1503672&r2=1503673&view=diff
==============================================================================
---
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
(original)
+++
stanbol/branches/commons-ng/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/resource/BaseStanbolResource.java
Tue Jul 16 12:01:40 2013
@@ -60,7 +60,7 @@ public class BaseStanbolResource extends
}
/**
- * Subclassed extend this object typically as inline object to provide
+ * Subclassed extend this object to provide
* a data model for rendering with a Viewable Object
*/
public abstract class ResultData extends TemplateLayoutConfiguration {
Modified: stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml?rev=1503673&r1=1503672&r2=1503673&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/web/viewable-writer/pom.xml Tue Jul 16
12:01:40 2013
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>2.3.19</version>
+ <version>2.3.20</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified:
stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1503673&r1=1503672&r2=1503673&view=diff
==============================================================================
---
stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
(original)
+++
stanbol/branches/commons-ng/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
Tue Jul 16 12:01:40 2013
@@ -223,7 +223,7 @@
<bundle>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.2-b04</version>
+ <version>1.2</version>
</bundle>
</startLevel>
<startLevel level="24">
Added: stanbol/branches/commons-ng/launchers/stable/nbactions.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/stable/nbactions.xml?rev=1503673&view=auto
==============================================================================
--- stanbol/branches/commons-ng/launchers/stable/nbactions.xml (added)
+++ stanbol/branches/commons-ng/launchers/stable/nbactions.xml Tue Jul 16
12:01:40 2013
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>run</actionName>
+ <goals>
+ <goal>clean</goal>
+ <goal>package</goal>
+ <goal>antrun:run</goal>
+ <goal>-o</goal>
+ </goals>
+ </action>
+ <action>
+ <actionName>debug</actionName>
+ <goals>
+ <goal>clean</goal>
+ <goal>package</goal>
+ <goal>antrun:run</goal>
+ <goal>-o</goal>
+ </goals>
+ <properties>
+ <vm.args>-Xdebug
-Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</vm.args>
+ <jpda.listen>true</jpda.listen>
+ </properties>
+ </action>
+ <action>
+ <actionName>profile</actionName>
+ <goals>
+ <goal>clean</goal>
+ <goal>package</goal>
+ <goal>antrun:run</goal>
+ <goal>-o</goal>
+ </goals>
+ <properties>
+ <vm.args>${profiler.args}</vm.args>
+ <!-- XXX <java jvm="${profiler.java}" ...> -->
+ <profiler.action>profile</profiler.action>
+ </properties>
+ </action>
+ <action>
+ <actionName>CUSTOM-resume-debug</actionName>
+ <displayName>Resume Debug</displayName>
+ <goals>
+ <goal>antrun:run</goal>
+ </goals>
+ <properties>
+ <vm.args>-Xdebug
-Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</vm.args>
+ <jpda.listen>true</jpda.listen>
+ </properties>
+ </action>
+</actions>
Added: stanbol/branches/commons-ng/nbactions.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/nbactions.xml?rev=1503673&view=auto
==============================================================================
--- stanbol/branches/commons-ng/nbactions.xml (added)
+++ stanbol/branches/commons-ng/nbactions.xml Tue Jul 16 12:01:40 2013
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>CUSTOM-update-parents</actionName>
+ <displayName>update-parents</displayName>
+ <goals>
+ <goal>versions:update-parent</goal>
+ </goals>
+ <properties>
+ <allowSnapshots>true</allowSnapshots>
+ </properties>
+ </action>
+ <action>
+ <actionName>build</actionName>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ <properties>
+ <Env.MAVEN_OPTS>-Xmx1024M -XX:MaxPermSize=128M</Env.MAVEN_OPTS>
+ </properties>
+ </action>
+ <action>
+ <actionName>rebuild</actionName>
+ <goals>
+ <goal>clean</goal>
+ <goal>install</goal>
+ </goals>
+ <properties>
+ <Env.MAVEN_OPTS>-Xmx1024M -XX:MaxPermSize=128M</Env.MAVEN_OPTS>
+ </properties>
+ </action>
+ </actions>
