knobot-cvs Mailing List for WYMIWYG - KnoBot

Status: Beta

Brought to you by: rebach

knobot-cvs — cvs commit logs

You can subscribe to this list here.

2006	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul (26)	_Aug (60)	_Sep (256)	_Oct (98)	_Nov (4)	_Dec (5)
2007	_Jan (1)	_Feb (101)	_Mar (11)	_Apr (5)	_May (16)	_Jun (22)	_Jul (5)	_Aug (5)	_Sep (43)	_Oct	_Nov	_Dec
2008	_Jan (2)	_Feb (157)	_Mar (71)	_Apr (63)	_May (1)	_Jun	_Jul	_Aug	_Sep	_Oct (1)	_Nov	_Dec
2009	_Jan (14)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 .. 39 > >> (Page 1 of 39)

[Knobot-cvs] SF.net SVN: knobot:[157] rwcf-app-model-serializer/trunk/pom.xml

From: <re...@us...> - 2009-01-02 18:45:56

Revision: 157
          http://knobot.svn.sourceforge.net/knobot/?rev=157&view=rev
Author:   rebach
Date:     2009-01-02 18:45:51 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-app-model-serializer/trunk/pom.xml

Modified: rwcf-app-model-serializer/trunk/pom.xml
===================================================================
--- rwcf-app-model-serializer/trunk/pom.xml	2009-01-02 18:45:06 UTC (rev 156)
+++ rwcf-app-model-serializer/trunk/pom.xml	2009-01-02 18:45:51 UTC (rev 157)
@@ -3,11 +3,12 @@
 	<parent>
 		<groupId>org.wymiwyg.rwcf</groupId>
 		<artifactId>rwcf-apps</artifactId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>rwcf-app-model-serializer</artifactId>
-	<version>0.4</version>
+	<artifactId>org.wymiwyg.rwcf.tools.modeler</artifactId>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<description></description>
 
 </project>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[156] rwcf-app-redirection/trunk/pom.xml

From: <re...@us...> - 2009-01-02 18:45:11

Revision: 156
          http://knobot.svn.sourceforge.net/knobot/?rev=156&view=rev
Author:   rebach
Date:     2009-01-02 18:45:06 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-app-redirection/trunk/pom.xml

Modified: rwcf-app-redirection/trunk/pom.xml
===================================================================
--- rwcf-app-redirection/trunk/pom.xml	2009-01-02 18:44:51 UTC (rev 155)
+++ rwcf-app-redirection/trunk/pom.xml	2009-01-02 18:45:06 UTC (rev 156)
@@ -3,11 +3,12 @@
 	<parent>
 		<groupId>org.wymiwyg.rwcf</groupId>
 		<artifactId>rwcf-apps</artifactId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>rwcf-app-redirection</artifactId>
-	<version>0.4</version>
+	<artifactId>org.wymiwyg.rwcf.tools.redirections</artifactId>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<description></description>
 	<dependencies>
 		<dependency>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[155] rwcf-apps/trunk/pom.xml

From: <re...@us...> - 2009-01-02 18:44:55

Revision: 155
          http://knobot.svn.sourceforge.net/knobot/?rev=155&view=rev
Author:   rebach
Date:     2009-01-02 18:44:51 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-apps/trunk/pom.xml

Modified: rwcf-apps/trunk/pom.xml
===================================================================
--- rwcf-apps/trunk/pom.xml	2009-01-02 18:44:33 UTC (rev 154)
+++ rwcf-apps/trunk/pom.xml	2009-01-02 18:44:51 UTC (rev 155)
@@ -6,12 +6,12 @@
 	<groupId>org.wymiwyg.rwcf</groupId>
 	<artifactId>rwcf-apps</artifactId>
 	<packaging>pom</packaging>
-	<version>0.0.1</version>
+	<version>0.2-SNAPSHOT</version>
 	<dependencies>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
 			<artifactId>rwcf</artifactId>
-			<version>0.4</version>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
@@ -130,6 +130,28 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-scr-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-scr-scrdescriptor</id>
+						<goals>
+							<goal>scr</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<distributionManagement>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[154] rwcf-app-extension-handler/trunk/pom.xml

From: <re...@us...> - 2009-01-02 18:44:36

Revision: 154
          http://knobot.svn.sourceforge.net/knobot/?rev=154&view=rev
Author:   rebach
Date:     2009-01-02 18:44:33 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-app-extension-handler/trunk/pom.xml

Modified: rwcf-app-extension-handler/trunk/pom.xml
===================================================================
--- rwcf-app-extension-handler/trunk/pom.xml	2009-01-02 18:44:12 UTC (rev 153)
+++ rwcf-app-extension-handler/trunk/pom.xml	2009-01-02 18:44:33 UTC (rev 154)
@@ -3,17 +3,18 @@
 	<parent>
 		<groupId>org.wymiwyg.rwcf</groupId>
 		<artifactId>rwcf-apps</artifactId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>rwcf-app-extension-handler</artifactId>
-	<version>0.4</version>
+	<artifactId>org.wymiwyg.rwcf.tools.extensionhandler</artifactId>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<description></description>
 	<dependencies>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-language-tools</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.language</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[153] rwcf-app-404handling/trunk/pom.xml

From: <re...@us...> - 2009-01-02 18:44:17

Revision: 153
          http://knobot.svn.sourceforge.net/knobot/?rev=153&view=rev
Author:   rebach
Date:     2009-01-02 18:44:12 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-app-404handling/trunk/pom.xml

Modified: rwcf-app-404handling/trunk/pom.xml
===================================================================
--- rwcf-app-404handling/trunk/pom.xml	2009-01-02 18:43:44 UTC (rev 152)
+++ rwcf-app-404handling/trunk/pom.xml	2009-01-02 18:44:12 UTC (rev 153)
@@ -5,31 +5,47 @@
 	<parent>
 		<groupId>org.wymiwyg.rwcf</groupId>
 		<artifactId>rwcf-apps</artifactId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>rwcf-app-404handling</artifactId>
-	<version>0.4</version>
+	<artifactId>org.wymiwyg.rwcf.tools.404handling</artifactId>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-fileserver</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.fileserver</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-hostcanonicalizer</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.hostcanonicalizer</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-language-tools</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.language</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-virtuser</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.virtuser</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>org.wymiwyg.rwcf.tools.creative;org.wymiwyg.rwcf.tools.notfound</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[152] rwcf-prevaloader/trunk/pom.xml

From: <re...@us...> - 2009-01-02 18:43:48

Revision: 152
          http://knobot.svn.sourceforge.net/knobot/?rev=152&view=rev
Author:   rebach
Date:     2009-01-02 18:43:44 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-prevaloader/trunk/pom.xml

Modified: rwcf-prevaloader/trunk/pom.xml
===================================================================
--- rwcf-prevaloader/trunk/pom.xml	2009-01-02 18:43:26 UTC (rev 151)
+++ rwcf-prevaloader/trunk/pom.xml	2009-01-02 18:43:44 UTC (rev 152)
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wymiwyg-commons-jena</artifactId>
-			<version>0.5</version>
+			<version>0.5.3</version>
 		</dependency>
 	</dependencies>
 	<distributionManagement>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[151] rwcf-app-rdf-insertion/trunk/pom.xml

From: <re...@us...> - 2009-01-02 18:43:31

Revision: 151
          http://knobot.svn.sourceforge.net/knobot/?rev=151&view=rev
Author:   rebach
Date:     2009-01-02 18:43:26 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-app-rdf-insertion/trunk/pom.xml

Modified: rwcf-app-rdf-insertion/trunk/pom.xml
===================================================================
--- rwcf-app-rdf-insertion/trunk/pom.xml	2009-01-02 18:43:07 UTC (rev 150)
+++ rwcf-app-rdf-insertion/trunk/pom.xml	2009-01-02 18:43:26 UTC (rev 151)
@@ -5,12 +5,13 @@
 	<parent>
 		<groupId>org.wymiwyg.rwcf</groupId>
 		<artifactId>rwcf-apps</artifactId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.wymiwyg.rwcf</groupId>
-	<artifactId>rwcf-app-rdf-insertion</artifactId>
-	<version>0.4</version>
+	<artifactId>org.wymiwyg.rwcf.tools.insert</artifactId>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[150] rwcf-app-language-tools/trunk

From: <re...@us...> - 2009-01-02 18:43:12

Revision: 150
          http://knobot.svn.sourceforge.net/knobot/?rev=150&view=rev
Author:   rebach
Date:     2009-01-02 18:43:07 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-app-language-tools/trunk/pom.xml
    rwcf-app-language-tools/trunk/src/main/java/org/wymiwyg/rwcf/tools/language/LanguageChooser.java

Modified: rwcf-app-language-tools/trunk/pom.xml
===================================================================
--- rwcf-app-language-tools/trunk/pom.xml	2009-01-02 18:40:20 UTC (rev 149)
+++ rwcf-app-language-tools/trunk/pom.xml	2009-01-02 18:43:07 UTC (rev 150)
@@ -3,11 +3,12 @@
 	<parent>
 		<artifactId>rwcf-apps</artifactId>
 		<groupId>org.wymiwyg.rwcf</groupId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>rwcf-app-language-tools</artifactId>
-	<version>0.4</version>
+	<artifactId>org.wymiwyg.rwcf.tools.language</artifactId>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<description />
 	<dependencies>
 		<dependency>

Modified: rwcf-app-language-tools/trunk/src/main/java/org/wymiwyg/rwcf/tools/language/LanguageChooser.java
===================================================================
--- rwcf-app-language-tools/trunk/src/main/java/org/wymiwyg/rwcf/tools/language/LanguageChooser.java	2009-01-02 18:40:20 UTC (rev 149)
+++ rwcf-app-language-tools/trunk/src/main/java/org/wymiwyg/rwcf/tools/language/LanguageChooser.java	2009-01-02 18:43:07 UTC (rev 150)
@@ -56,7 +56,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.regexp.RE;
 import org.wymiwyg.commons.jena.JenaUtil;
 import org.wymiwyg.commons.vocabulary.LINK;
 import org.wymiwyg.rwcf.Handler;
@@ -79,13 +78,14 @@
 import com.hp.hpl.jena.rdf.model.Statement;
 import com.hp.hpl.jena.vocabulary.RDF;
 import com.hp.hpl.jena.vocabulary.RSS;
+import java.util.regex.Pattern;
 
 /**
  * @author reto
  */
 public class LanguageChooser implements Handler {
-	private Model model;
 
+	private Model model;
 	private static Log log = LogFactory.getLog(LanguageChooser.class);
 
 	/*
@@ -114,8 +114,7 @@
 		resultModel.read(getClass().getResource("selection.rdf").toString());
 		Resource mainFromFile = resultModel.listSubjectsWithProperty(RDF.type,
 				RSS.channel).nextResource();
-		Resource main = resultModel.createResource(ehRequest
-				.getFullRequestURL().toString());
+		Resource main = resultModel.createResource(ehRequest.getFullRequestURL().toString());
 		JenaUtil.replace(resultModel, mainFromFile, main);
 
 		/*
@@ -145,7 +144,7 @@
 			targetLinkBuffer.append('&');
 		} else {
 			targetLinkBuffer.append('?');
-			//targetLinkBuffer.append('.');
+		//targetLinkBuffer.append('.');
 		}
 		targetLinkBuffer.append("appendLang=");
 		String targetLinkBase = targetLinkBuffer.toString();
@@ -166,18 +165,15 @@
 			}
 			languageResIter.close();
 			languageLink.addProperty(LANGUAGE.available, language);
-			Resource target = resultModel.createResource(targetLinkBase
-					+ available[i]);
+			Resource target = resultModel.createResource(targetLinkBase + available[i]);
 			languageLink.addProperty(LINK.target, target);
 			// result.addProperty(LINK.link, languageLink);
 			linkSeq.add(languageLink);
 		}
 		main.addProperty(LINK.links, linkSeq);
-		response
-				.setHeader(HeaderName.CONTENT_TYPE,
-						"application/java-instance;class=com.hp.hpl.jena.rdf.model.Model");
-		Resource transaction = resultModel
-				.createResource(TRANSACTION.Transaction);
+		response.setHeader(HeaderName.CONTENT_TYPE,
+				"application/java-instance;class=com.hp.hpl.jena.rdf.model.Model");
+		Resource transaction = resultModel.createResource(TRANSACTION.Transaction);
 		transaction.addProperty(TRANSACTION.mainResponseResource, main);
 		response.setBody(resultModel);
 	}
@@ -207,15 +203,13 @@
 			Resource current = supportedLanguageIter.nextResource();
 			try {
 
-				String abbreviation = current
-						.getProperty(LANGUAGE.abbreviation).getString();
-				Statement availabilityStmt = current
-						.getProperty(LANGUAGE.availability);
+				String abbreviation = current.getProperty(LANGUAGE.abbreviation).getString();
+				Statement availabilityStmt = current.getProperty(LANGUAGE.availability);
 				if (availabilityStmt != null) {
 					String availability = availabilityStmt.getString();
 					try {
-						RE re = new RE(availability);
-						if (!re.match(request.getFullRequestURL().toString())) {
+						Pattern re = Pattern.compile(availability);
+						if (!re.matcher(request.getFullRequestURL().toString()).matches()) {
 							continue;
 						}
 					} catch (Exception ex) {
@@ -230,21 +224,18 @@
 		List languageSelectionList = new ArrayList();
 		AcceptLanguagesIterator acceptIter = request.getAcceptLanguages();
 		while (acceptIter.hasNext()) {
-			AcceptLanguageHeaderEntry current = acceptIter
-					.nextAcceptLanguageHeader();
+			AcceptLanguageHeaderEntry current = acceptIter.nextAcceptLanguageHeader();
 			Locale locale = current.getLocaleRange().getLocale();
 			if (locale == null) {
 				continue;
 			}
 			String abbreviation = locale.getLanguage();
-			Resource languageResource = (Resource) supportedLanguageMap
-					.get(abbreviation);
+			Resource languageResource = (Resource) supportedLanguageMap.get(abbreviation);
 			if (languageResource != null) {
 				supportedLanguageMap.remove(abbreviation);
 				targetModel.add(JenaUtil.getExpandedResource(languageResource,
 						3));
-				languageResource = (Resource) languageResource
-						.inModel(targetModel);
+				languageResource = (Resource) languageResource.inModel(targetModel);
 				languageResource.addProperty(RDF.type,
 						LANGUAGE.SelectedLanguage);
 				languageSelectionList.add(languageResource);
@@ -253,16 +244,12 @@
 		SortedSet sortedRemainingLanguages = new TreeSet(new Comparator() {
 
 			public int compare(Object arg0, Object arg1) {
-				return ((Resource) arg0).getProperty(LANGUAGE.name).getString()
-						.compareTo(
-								((Resource) arg1).getProperty(LANGUAGE.name)
-										.getString());
+				return ((Resource) arg0).getProperty(LANGUAGE.name).getString().compareTo(
+						((Resource) arg1).getProperty(LANGUAGE.name).getString());
 			}
-
 		});
 		sortedRemainingLanguages.addAll(supportedLanguageMap.values());
-		for (Iterator iter = sortedRemainingLanguages.iterator(); iter
-				.hasNext();) {
+		for (Iterator iter = sortedRemainingLanguages.iterator(); iter.hasNext();) {
 			Resource languageResource = (Resource) iter.next();
 			targetModel.add(JenaUtil.getExpandedResource(languageResource, 3));
 			languageResource = (Resource) languageResource.inModel(targetModel);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[149] rwcf-wrhapi/trunk

From: <re...@us...> - 2009-01-02 18:40:26

Revision: 149
          http://knobot.svn.sourceforge.net/knobot/?rev=149&view=rev
Author:   rebach
Date:     2009-01-02 18:40:20 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-wrhapi/trunk/pom.xml
    rwcf-wrhapi/trunk/src/main/java/org/wymiwyg/rwcf/wrhapi/RWCFInvoker.java

Modified: rwcf-wrhapi/trunk/pom.xml
===================================================================
--- rwcf-wrhapi/trunk/pom.xml	2009-01-02 18:39:52 UTC (rev 148)
+++ rwcf-wrhapi/trunk/pom.xml	2009-01-02 18:40:20 UTC (rev 149)
@@ -3,14 +3,16 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<groupId>org.wymiwyg.rwcf</groupId>
 	<artifactId>rwcf-wrhapi</artifactId>
-	<version>0.1</version>
+	<version>0.2-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wrhapi</artifactId>
-			<version>0.2.0</version>
+			<version>0.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
@@ -27,13 +29,28 @@
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wymiwyg-commons-jena</artifactId>
-			<version>0.5</version>
+			<version>0.5.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
 			<artifactId>rwcf</artifactId>
+			<version>0.5-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.wymiwyg.rwcf</groupId>
+			<artifactId>org.wymiwyg.rwcf.tools.fileserver</artifactId>
+			<version>0.5-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.trialox</groupId>
+			<artifactId>org.trialox.rdf.core</artifactId>
 			<version>0.4</version>
 		</dependency>
+		<dependency>
+			<groupId>org.trialox</groupId>
+			<artifactId>org.trialox.rdf.jena.facade</artifactId>
+			<version>0.4</version>
+		</dependency>
 		<!-- <dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
 			<artifactId>rwcf-tool-admin</artifactId>
@@ -81,6 +98,29 @@
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>org.wymiwyg.rwcf.wrhapi</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-scr-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-scr-scrdescriptor</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>scr</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>

Modified: rwcf-wrhapi/trunk/src/main/java/org/wymiwyg/rwcf/wrhapi/RWCFInvoker.java
===================================================================
--- rwcf-wrhapi/trunk/src/main/java/org/wymiwyg/rwcf/wrhapi/RWCFInvoker.java	2009-01-02 18:39:52 UTC (rev 148)
+++ rwcf-wrhapi/trunk/src/main/java/org/wymiwyg/rwcf/wrhapi/RWCFInvoker.java	2009-01-02 18:40:20 UTC (rev 149)
@@ -16,14 +16,32 @@
  */
 package org.wymiwyg.rwcf.wrhapi;
 
+import com.hp.hpl.jena.graph.Graph;
+import com.hp.hpl.jena.graph.compose.MultiUnion;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.ComponentContext;
+import org.trialox.rdf.core.TripleCollection;
+import org.trialox.rdf.core.UriRef;
+import org.trialox.rdf.core.access.NoSuchEntityException;
+import org.trialox.rdf.core.access.TcManager;
+import org.trialox.rdf.jena.facade.JenaGraph;
 import org.wymiwyg.rwcf.impl.HandlerContextImpl;
 import org.wymiwyg.rwcf.impl.ResourceLocator;
+import org.wymiwyg.rwcf.tools.fileserver.OsgiBundleEntryLocator;
 import org.wymiwyg.wrhapi.Handler;
 import org.wymiwyg.wrhapi.HandlerException;
 import org.wymiwyg.wrhapi.Request;
@@ -31,25 +49,62 @@
 
 /**
  * @author reto
- *
+ * @scr.component
+ * @scr.service interface="org.wymiwyg.wrhapi.Handler"
+ * @scr.property name="graph" value="http://localhost/"
  */
-public class RWCFInvoker implements Handler{
+public class RWCFInvoker implements Handler {
 	//private Model model;
 
 	private static final Log log = LogFactory.getLog(RWCFInvoker.class);
-
 	private HandlerContextImpl handlerContext;
+	/**
+	 * this is here only to mae sure it is started before this service
+	 *
+	 * @scr.reference
+	 */
+	OsgiBundleEntryLocator locator;
+	/**
+	 * @scr.reference
+	 */
+	TcManager tcManager;
 
 	/**
 	 * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
 	 */
-	public RWCFInvoker() {
+	protected void activate(ComponentContext context) throws Exception {
+		log.info("activating RWCFInvoker with locator: " + locator);
+		String graphName = (String) context.getProperties().get("graph");
+		TripleCollection graph;
+		try {
+			graph = tcManager.getMGraph(
+					new UriRef(graphName));
+		} catch (NoSuchEntityException e) {
+			graph = tcManager.createMGraph(
+					new UriRef(graphName));
+		}
+		Graph jenaGraph = new JenaGraph(graph);
+		
+		final BundleContext bundleContext = context.getBundleContext();
+		Bundle[] installedBundles = bundleContext.getBundles();
+		jenaGraph = addBundleTriples(installedBundles, jenaGraph);
+		/* bundles must be installed before this service is started
+		bundleContext.addBundleListener(new BundleListener() {
 
+			public void bundleChanged(BundleEvent event) {
+				if ((event.getType() == BundleEvent.INSTALLED) || (event.getType() == BundleEvent.UPDATED)) {
+					try {
+						addBundleTriples(event.getBundle(), jenaGraph);
+					} catch (IOException ex) {
+						throw new RuntimeException(ex);
+					}
+				}
+			}
+		});*/
 		handlerContext = new HandlerContextImpl(new ResourceLocator() {
 
 			public URL getBaseDir() {
-				String rwcfBaseString = System
-						.getProperty("org.wymiwyg.rwcf.home");
+				String rwcfBaseString = System.getProperty("org.wymiwyg.rwcf.home");
 				if (rwcfBaseString != null) {
 					try {
 						return new URL(rwcfBaseString);
@@ -58,32 +113,65 @@
 							return new File(rwcfBaseString).toURI().toURL();
 						} catch (MalformedURLException ex1) {
 							throw new RuntimeException(
-									"Invalid URL set as rwcf-home: "
-											+ rwcfBaseString, ex);
+									"Invalid URL set as rwcf-home: " + rwcfBaseString, ex);
 						}
 					}
 				} else {
 					try {
-						log.warn("org.wymiwyg.rwcf.home not set");
+						log.info("org.wymiwyg.rwcf.home not set, using cwd");
 						return new File(".").toURI().toURL();
 					} catch (MalformedURLException ex) {
 						throw new RuntimeException(ex);
 					}
 				}
 			}
-
-		});
-		//model = handlerContext.getModel();
+		}, ModelFactory.createModelForGraph(jenaGraph));
+	//model = handlerContext.getModel();
 	}
 
-
-
-
-
 	public void handle(Request request, Response response)
 			throws HandlerException {
-			ResponseWrapper responseWrapper = new ResponseWrapper(response);
-			handlerContext.perform(request, responseWrapper);
-			responseWrapper.waitTillBodyWritten();
+		ResponseWrapper responseWrapper = new ResponseWrapper(response);
+		handlerContext.perform(request, responseWrapper);
+		responseWrapper.waitTillBodyWritten();
 	}
+
+	/**
+	 * returns the graphs read from META-INF/rwcf
+	 */
+	private Collection<Graph> getBundleGraphs(Bundle bundle) {
+		List<Graph> unitedGraphs = new ArrayList<Graph>();
+		Enumeration entries = bundle.getEntryPaths("META-INF/rwcf");
+		
+		if (entries != null) {
+			while (entries.hasMoreElements()) {
+				String entry = (String) entries.nextElement();
+				log.debug("processing entry: " + entry);
+				URL entryURL = bundle.getEntry(entry);
+				Model model = ModelFactory.createDefaultModel();
+				try {
+					model.read(entryURL.openStream(), null);
+				} catch (IOException ex) {
+					throw new RuntimeException(ex);
+				}
+				unitedGraphs.add(model.getGraph());
+			}
+		}
+		return unitedGraphs;
+	}
+	
+	private Graph addBundleTriples(Bundle[] installedBundles, Graph graph)
+			throws IOException {
+		log.debug("adding triples for " + installedBundles.length
+				+" bundles to a graph of size "+graph.size());
+		List<Graph> unitedGraphs = new ArrayList<Graph>();
+		unitedGraphs.add(graph);
+		for (Bundle installedBundle : installedBundles) {
+			unitedGraphs.addAll(getBundleGraphs(installedBundle));
+		}
+		Graph result = new MultiUnion(unitedGraphs.iterator());
+		log.info(("returning graph of size "+result.size()));
+		return result;
+
+	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[148] rwcf-app-docserver/trunk

From: <re...@us...> - 2009-01-02 18:39:56

Revision: 148
          http://knobot.svn.sourceforge.net/knobot/?rev=148&view=rev
Author:   rebach
Date:     2009-01-02 18:39:52 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-app-docserver/trunk/pom.xml
    rwcf-app-docserver/trunk/src/main/java/org/wymiwyg/rwcf/tools/docserver/AudioContentProcessor.java

Modified: rwcf-app-docserver/trunk/pom.xml
===================================================================
--- rwcf-app-docserver/trunk/pom.xml	2009-01-02 18:39:32 UTC (rev 147)
+++ rwcf-app-docserver/trunk/pom.xml	2009-01-02 18:39:52 UTC (rev 148)
@@ -5,32 +5,33 @@
 	<parent>
 		<groupId>org.wymiwyg.rwcf</groupId>
 		<artifactId>rwcf-apps</artifactId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>rwcf-app-docserver</artifactId>
-	<version>0.4</version>
+	<artifactId>org.wymiwyg.rwcf.tools.docserver</artifactId>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-fileserver</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.fileserver</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-language-tools</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.language</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-template-setter</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.template</artifactId>
+			<version>0.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-admin</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.admin</artifactId>
+			<version>0.5-SNAPSHOT</version>
 			<scope>runtime</scope>
 			<!-- This is so that an admin user can be created -->
 		</dependency>

Modified: rwcf-app-docserver/trunk/src/main/java/org/wymiwyg/rwcf/tools/docserver/AudioContentProcessor.java
===================================================================
--- rwcf-app-docserver/trunk/src/main/java/org/wymiwyg/rwcf/tools/docserver/AudioContentProcessor.java	2009-01-02 18:39:32 UTC (rev 147)
+++ rwcf-app-docserver/trunk/src/main/java/org/wymiwyg/rwcf/tools/docserver/AudioContentProcessor.java	2009-01-02 18:39:52 UTC (rev 148)
@@ -69,7 +69,7 @@
 			// Title of song (comment)
 			String title = (String) props.get("title");
 			if (title != null) {
-				resource.addProperty(DC.title, props.get("title"));
+				resource.addProperty(DC.title, title);
 			}
 			String author = (String) props.get("author");
 			if (author != null) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[147] rwcf-app-hostcanonicalizer/trunk/pom.xml

From: <re...@us...> - 2009-01-02 18:39:36

Revision: 147
          http://knobot.svn.sourceforge.net/knobot/?rev=147&view=rev
Author:   rebach
Date:     2009-01-02 18:39:32 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-app-hostcanonicalizer/trunk/pom.xml

Modified: rwcf-app-hostcanonicalizer/trunk/pom.xml
===================================================================
--- rwcf-app-hostcanonicalizer/trunk/pom.xml	2009-01-02 18:39:17 UTC (rev 146)
+++ rwcf-app-hostcanonicalizer/trunk/pom.xml	2009-01-02 18:39:32 UTC (rev 147)
@@ -3,12 +3,12 @@
 	<parent>
 		<groupId>org.wymiwyg.rwcf</groupId>
 		<artifactId>rwcf-apps</artifactId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>rwcf-app-hostcanonicalizer</artifactId>
-	<version>0.4</version>
-	<description></description>
+	<artifactId>org.wymiwyg.rwcf.tools.hostcanonicalizer</artifactId>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[146] rwcf/trunk

From: <re...@us...> - 2009-01-02 18:39:21

Revision: 146
          http://knobot.svn.sourceforge.net/knobot/?rev=146&view=rev
Author:   rebach
Date:     2009-01-02 18:39:17 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf/trunk/pom.xml
    rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/HandlerContextImpl.java
    rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/HandlerDescriptor.java
    rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/ModelUtil.java

Modified: rwcf/trunk/pom.xml
===================================================================
--- rwcf/trunk/pom.xml	2009-01-02 18:38:45 UTC (rev 145)
+++ rwcf/trunk/pom.xml	2009-01-02 18:39:17 UTC (rev 146)
@@ -5,12 +5,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.wymiwyg.rwcf</groupId>
 	<artifactId>rwcf</artifactId>
-	<version>0.4</version>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
 			<artifactId>wymiwyg-commons-jena</artifactId>
-			<version>0.5</version>
+			<version>0.5.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg</groupId>
@@ -54,6 +55,18 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>org.wymiwyg.rwcf</Bundle-SymbolicName>
+						<DynamicImport-Package>*</DynamicImport-Package>
+						<Import-Package></Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>

Modified: rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/HandlerContextImpl.java
===================================================================
--- rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/HandlerContextImpl.java	2009-01-02 18:38:45 UTC (rev 145)
+++ rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/HandlerContextImpl.java	2009-01-02 18:39:17 UTC (rev 146)
@@ -155,7 +155,7 @@
      * @param model
      */
     public HandlerContextImpl(ResourceLocator resourceLocator, Model model) {
-        this.model = model;
+        this.model = model;//ModelUtil.getModelWithModelSections(model);
         this.resourceLocator = resourceLocator;
         accessControlFilter = new AccessControlFilter();
         accessControlFilter.init(new HandlerConfigImp(model.createResource(),

Modified: rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/HandlerDescriptor.java
===================================================================
--- rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/HandlerDescriptor.java	2009-01-02 18:38:45 UTC (rev 145)
+++ rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/HandlerDescriptor.java	2009-01-02 18:39:17 UTC (rev 146)
@@ -266,6 +266,7 @@
 			throw new RuntimeException(ex);
 		}
 		try {
+			//Class clazz = Thread.currentThread().getContextClassLoader().loadClass(javaClass);
 			Class clazz = Class.forName(javaClass);
 			Handler unitializedHandler;
 			try {
@@ -279,14 +280,15 @@
 			handler = unitializedHandler;
 		} catch (ClassNotFoundException e) {
 			throw new RuntimeException("Handler with class " + javaClass
-					+ " could not be loaded");
+					+ " could not be loaded (using Class.forName())", e);
 		} catch (InstantiationException e) {
 			throw new RuntimeException("Handler with class " + javaClass
-					+ " could not be instanciated");
+					+ " could not be instanciated", e);
 		} catch (IllegalAccessException e) {
 			throw new RuntimeException("Hanlder with class " + javaClass
-					+ " could not be instanciated (illegal access)");
+					+ " could not be instanciated (illegal access)", e);
 		}
+		log.debug("loaded "+javaClass);
 	}
 
 	/**

Modified: rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/ModelUtil.java
===================================================================
--- rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/ModelUtil.java	2009-01-02 18:38:45 UTC (rev 145)
+++ rwcf/trunk/src/main/java/org/wymiwyg/rwcf/impl/ModelUtil.java	2009-01-02 18:39:17 UTC (rev 146)
@@ -87,7 +87,7 @@
 	 * @param base
 	 * @return
 	 */
-	private Model getModelWithModelSections(Model base) {
+	public static Model getModelWithModelSections(Model base) {
 		boolean resinsert = "true".equals(System
 				.getProperty("org.wymiwyg.knobot.boot.reinsert"));
 		boolean removeHandler = "true".equals(System
@@ -232,7 +232,7 @@
 	/**
 	 * @param base
 	 */
-	private void removeHandlers(Model base) {
+	private static void removeHandlers(Model base) {
 		Set handlers = new HashSet();
 		ResIterator iter = base.listSubjectsWithProperty(RDF.type, RWCF.Filter);
 		while (iter.hasNext()) {
@@ -261,7 +261,7 @@
 	 * 
 	 * @return
 	 */
-	private URL[] getModelSectionURLs() {
+	private static URL[] getModelSectionURLs() {
 		List resultList = new ArrayList();
 		// getModelSectionsWebapp(resultList);
 		getModelSectionsComponents(resultList);
@@ -278,7 +278,7 @@
 	/**
 	 * @param resultList
 	 */
-	private void getModelSectionsComponents(List resultList) {
+	private static void getModelSectionsComponents(List resultList) {
 		Enumeration enumeration;
 		try {
 			enumeration = ModelUtil.class.getClassLoader().getResources(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[145] knobot-topicspace/trunk

From: <re...@us...> - 2009-01-02 18:38:49

Revision: 145
          http://knobot.svn.sourceforge.net/knobot/?rev=145&view=rev
Author:   rebach
Date:     2009-01-02 18:38:45 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    knobot-topicspace/trunk/.classpath
    knobot-topicspace/trunk/pom.xml
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/AggregateHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/BaseItemPostHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/CalendarTopicGetHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/CommentPostHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/NewItemHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/NewRelationHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/SetStrengthHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/TopicGetHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/TopicPostHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/actions/SetRelation.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/AntiAging.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/DefaultValuesHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/DefaultValuesPostHandler.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/aggregator/Aggregator.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/relations/Relation.java
    knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/relations/RelationManager.java
    knobot-topicspace/trunk/src/main/resources/META-INF/web/stylesheets/show-all-topics.xsl

Property Changed:
----------------
    knobot-topicspace/trunk/


Property changes on: knobot-topicspace/trunk
___________________________________________________________________
Modified: svn:ignore
   - target

   + target
.settings


Modified: knobot-topicspace/trunk/.classpath
===================================================================
--- knobot-topicspace/trunk/.classpath	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/.classpath	2009-01-02 18:38:45 UTC (rev 145)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: knobot-topicspace/trunk/pom.xml
===================================================================
--- knobot-topicspace/trunk/pom.xml	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/pom.xml	2009-01-02 18:38:45 UTC (rev 145)
@@ -3,59 +3,72 @@
 	<parent>
 		<artifactId>rwcf-apps</artifactId>
 		<groupId>org.wymiwyg.rwcf</groupId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.wymiwyg.knobot</groupId>
-	<artifactId>knobot-topicspace</artifactId>
-	<version>0.5</version>
-	<description></description>
+	<artifactId>org.wymiwyg.knobot</artifactId>
+	<version>0.6-SNAPSHOT</version>
+	<packaging>bundle</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Embed-Dependency>jung,mail,colt,concurrent, jtidy</Embed-Dependency>
+						<Embed-Transitive>true</Embed-Transitive>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-hostcanonicalizer</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.hostcanonicalizer</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-virtuser</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.virtuser</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-docserver</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.docserver</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-rdf-insertion</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.insert</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-xslt</artifactId>
-			<version>0.4</version>
+			<artifactId>org.wymiwyg.rwcf.tools.xslt</artifactId>
+			<version>0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.wymiwyg.rwcf</groupId>
-			<artifactId>rwcf-app-styling</artifactId>
-			<version>0.4</version>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
 			<version>1.4</version>
 		</dependency>
 		<dependency>
-			<groupId>jtidy</groupId>
-			<artifactId>jtidy</artifactId>
-			<version>4aug2000r7-dev</version>
+	<groupId>jtidy</groupId>
+  <artifactId>jtidy</artifactId>
+		
+  <version>8.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>jung</groupId>
 			<artifactId>jung</artifactId>
 			<version>1.7.6</version>
 		</dependency>
+		
 	</dependencies>
 </project>

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/AggregateHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/AggregateHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/AggregateHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -78,9 +78,9 @@
 			int interval = Integer.parseInt(body.getParameter("interval"));
 			Resource newAggregator = model.createResource(AGGREGATOR.Aggregator);
 			newAggregator.addProperty(AGGREGATOR.aggregated, aggregated);
-			newAggregator.addProperty(AGGREGATOR.interval, interval);
-			newAggregator.addProperty(AGGREGATOR.nextDownload, System
-					.currentTimeMillis());
+			newAggregator.addProperty(AGGREGATOR.interval, model.createTypedLiteral(interval));
+			newAggregator.addProperty(AGGREGATOR.nextDownload, model.createTypedLiteral(System
+					.currentTimeMillis()));
 			String feedURLParam = body.getParameter("feedURL");
 			if ((feedURLParam != null) && (!feedURLParam.equals(""))) {
 				try {

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/BaseItemPostHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/BaseItemPostHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/BaseItemPostHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -245,10 +245,10 @@
 					.toString());
 		}
 		if (attachment.getWidth() > 0) {
-			attachmentItem.addProperty(ATTACH.width, attachment.getWidth());
+			attachmentItem.addProperty(ATTACH.width, model.createTypedLiteral(attachment.getWidth()));
 		}
 		if (attachment.getHeight() > 0) {
-			attachmentItem.addProperty(ATTACH.height, attachment.getHeight());
+			attachmentItem.addProperty(ATTACH.height, model.createTypedLiteral(attachment.getHeight()));
 		}
 		if (attachment.isInline()) {
 			attachmentItem.addProperty(RDF.type, ATTACH.InlineAttachment);
@@ -984,7 +984,7 @@
 			tidy.setWord2000(true);
 			tidy.setTidyMark(false);
 			tidy.setXmlOut(true);
-			tidy.setCharEncoding(Configuration.UTF8);
+			//tidy.setCharEncoding(Configuration.UTF8);
 			InputStream in;
 			try {
 				in = new ByteArrayInputStream(string.getBytes("utf-8"));

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/CalendarTopicGetHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/CalendarTopicGetHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/CalendarTopicGetHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -411,8 +411,8 @@
 		Resource transaction = resultModel
 				.createResource(TRANSACTION.Transaction);
 		transaction.addProperty(TRANSACTION.mainResponseResource, resource);
-		transaction.addProperty(KNOBOT.fromItemPos, from);
-		transaction.addProperty(KNOBOT.tillItemPos, till);
+		transaction.addProperty(KNOBOT.fromItemPos, model.createTypedLiteral(from));
+		transaction.addProperty(KNOBOT.tillItemPos, model.createTypedLiteral(till));
 		Literal currentDate =resultModel.createTypedLiteral(new W3CDateFormat()
                 .format(new Date()), XSDDatatype.XSDdateTime);
 		transaction.addProperty(DC.date, currentDate);
@@ -646,7 +646,7 @@
 				count++;
 			}
 		}
-		item.addProperty(KNOBOT.commentCount, count);
+		item.addProperty(KNOBOT.commentCount, model.createTypedLiteral(count));
 	}
 
 	/**

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/CommentPostHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/CommentPostHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/CommentPostHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -202,13 +202,13 @@
 				}
 			}
 			relation.addProperty(KNOBOT.strength, model.createTypedLiteral(1f));
-			relation.addProperty(KNOBOT.childStrength, 0.5);
+			relation.addProperty(KNOBOT.childStrength, model.createTypedLiteral(0.5f));
 			Literal effectiveDateLiteral = model.createTypedLiteral(
 					new W3CDateFormat().format(new Date()),
 					XSDDatatype.XSDdateTime);
 			relation.addProperty(KNOBOT.effectiveDate, effectiveDateLiteral);
-			relation.addProperty(KNOBOT.strengthReduction, DefaultValuesHandler
-					.getDefaultStrengthReduction(model));
+			relation.addProperty(KNOBOT.strengthReduction, model.createTypedLiteral(DefaultValuesHandler
+					.getDefaultStrengthReduction(model)));
 			Statement titleStatement = comment.getProperty(RSS.title);
 			if (titleStatement == null) {
 				throw new BadRequestException("Title is required");

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/NewItemHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/NewItemHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/NewItemHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -91,7 +91,7 @@
 		relation.addProperty(KNOBOT.source, topic);
 		relation.addProperty(KNOBOT.target, item);
 		relation.addProperty(KNOBOT.strength, model.createTypedLiteral(relevance));
-		relation.addProperty(KNOBOT.strengthReduction, aging);
+		relation.addProperty(KNOBOT.strengthReduction, model.createTypedLiteral(aging));
 		Literal effectiveDateLiteral = model.createTypedLiteral(new W3CDateFormat()
                 .format(new Date()), XSDDatatype.XSDdateTime);
 		relation.addProperty(KNOBOT.effectiveDate, effectiveDateLiteral);

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/NewRelationHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/NewRelationHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/NewRelationHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -139,7 +139,7 @@
 		} catch (Exception ex) {
 			strengthReduction = DefaultValuesHandler.getDefaultStrengthReduction(model);
 		}
-		newRelation.addProperty(KNOBOT.strengthReduction, strengthReduction);
+		newRelation.addProperty(KNOBOT.strengthReduction, model.createTypedLiteral(strengthReduction));
 		String childStrengthString = requestBody.getParameter("childStrength");
 		float childStrength;
 		if (childStrengthString != null) {
@@ -150,7 +150,7 @@
 				childStrength = DefaultValuesHandler
 						.getDefaultChildStrength(model);
 			}
-			newRelation.addProperty(KNOBOT.childStrength, childStrength);
+			newRelation.addProperty(KNOBOT.childStrength, model.createTypedLiteral(childStrength));
 		} else {
 			childStrength = 0; //so it does not try to aggregate the
 			// source
@@ -159,8 +159,8 @@
 				.getParameter("minimumChildStrengthReduction");
 		if ((childStrengthReduction != null)
 				&& (!childStrengthReduction.equals(""))) {
-			newRelation.addProperty(KNOBOT.minimumChildStrengthReduction, Float
-					.parseFloat(childStrengthReduction));
+			newRelation.addProperty(KNOBOT.minimumChildStrengthReduction, model.createTypedLiteral(Float
+					.parseFloat(childStrengthReduction)));
 		}
 		newRelation.addProperty(KNOBOT.source, relationSource);
 		newRelation.addProperty(KNOBOT.target, relationTarget);
@@ -264,9 +264,9 @@
 		int interval = 60;
 		Resource newAggregator = model.createResource(AGGREGATOR.Aggregator);
 		newAggregator.addProperty(AGGREGATOR.aggregated, relationTarget);
-		newAggregator.addProperty(AGGREGATOR.interval, interval);
+		newAggregator.addProperty(AGGREGATOR.interval, model.createTypedLiteral(interval));
 		long nextDownload = System.currentTimeMillis() + interval * 60 * 1000;
-		newAggregator.addProperty(AGGREGATOR.nextDownload, nextDownload);
+		newAggregator.addProperty(AGGREGATOR.nextDownload, model.createTypedLiteral(nextDownload));
 		try {
 			Aggregator.aggregate(newAggregator);
 		} catch (IOException ex) {

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/SetStrengthHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/SetStrengthHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/SetStrengthHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -207,19 +207,19 @@
 		} else {
 		    strengthReduction = DefaultValuesHandler.getDefaultStrengthReduction(model);
 		}
-		relation.addProperty(KNOBOT.strengthReduction, strengthReduction);
+		relation.addProperty(KNOBOT.strengthReduction, model.createTypedLiteral(strengthReduction));
 		float childStrength = 0;
 		if ((!keepStrength) && (childStrengthString != null)
 				&& (!childStrengthString.equals(""))) {
 			childStrength = Float.parseFloat(childStrengthString);
-			relation.addProperty(KNOBOT.childStrength, childStrength);
+			relation.addProperty(KNOBOT.childStrength, model.createTypedLiteral(childStrength));
 		}
 		String childStrengthReduction = requestBody
 				.getParameter("minimumChildStrengthReduction");
 		if ((childStrengthReduction != null)
 				&& (!childStrengthReduction.equals(""))) {
-			relation.addProperty(KNOBOT.minimumChildStrengthReduction, Float
-					.parseFloat(childStrengthReduction));
+			relation.addProperty(KNOBOT.minimumChildStrengthReduction, model.createTypedLiteral(Float
+					.parseFloat(childStrengthReduction)));
 		}
 		String comparativeStrengthString = requestBody
 				.getParameter("comparativeStrength");
@@ -230,7 +230,7 @@
 			if ((strength < comparativeStrength)
 					&& (childStrength < comparativeStrength)) {
 				relation.addProperty(KNOBOT.comparativeStrength,
-						comparativeStrength);
+						model.createTypedLiteral(comparativeStrength));
 			}
 
 		}

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/TopicGetHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/TopicGetHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/TopicGetHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -319,11 +319,11 @@
 				.createResource(TRANSACTION.Transaction);
 		transaction.addProperty(TRANSACTION.mainResponseResource, resource);
 		transaction
-				.addProperty(KNOBOT.fromItemPos, requestParameters.getFrom());
+				.addProperty(KNOBOT.fromItemPos, model.createTypedLiteral(requestParameters.getFrom()));
 		transaction
-				.addProperty(KNOBOT.tillItemPos, requestParameters.getTill());
-		transaction.addProperty(KNOBOT.itemsPerPage, requestParameters
-				.getItemsPerPage());
+				.addProperty(KNOBOT.tillItemPos, model.createTypedLiteral(requestParameters.getTill()));
+		transaction.addProperty(KNOBOT.itemsPerPage, model.createTypedLiteral(requestParameters
+				.getItemsPerPage()));
 		transaction.addProperty(KNOBOT.hasMoreItems, resultModel
 				.createTypedLiteral(hasMore));
 		Literal currentDate = resultModel
@@ -526,7 +526,7 @@
 				count++;
 			}
 		}
-		item.addProperty(KNOBOT.commentCount, count);
+		item.addProperty(KNOBOT.commentCount, model.createTypedLiteral(count));
 	}
 
 	/**

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/TopicPostHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/TopicPostHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/TopicPostHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -98,7 +98,8 @@
         relation.addProperty(KNOBOT.source, topic);
         relation.addProperty(KNOBOT.target, entry);
         relation.addProperty(KNOBOT.strength, model.createTypedLiteral(1f));
-        relation.addProperty(KNOBOT.strengthReduction, DefaultValuesHandler.getDefaultStrengthReduction(model));
+        relation.addProperty(KNOBOT.strengthReduction, 
+				model.createTypedLiteral(DefaultValuesHandler.getDefaultStrengthReduction(model)));
         Literal effectiveDateLiteral = model.createTypedLiteral(new W3CDateFormat()
                 .format(new Date()), XSDDatatype.XSDdateTime);
 		relation.addProperty(KNOBOT.effectiveDate, effectiveDateLiteral);

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/actions/SetRelation.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/actions/SetRelation.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/actions/SetRelation.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -100,7 +100,8 @@
         } catch (Exception ex) {
             strengthReduction = DefaultValuesHandler.getDefaultStrengthReduction(model);
         }
-        newRelation.addProperty(KNOBOT.strengthReduction, strengthReduction);
+        newRelation.addProperty(KNOBOT.strengthReduction, 
+				model.createTypedLiteral(model.createTypedLiteral(strengthReduction)));
         String childStrengthString = body.getParameter("childStrength");
         float childStrength;
         if (childStrengthString != null) {
@@ -111,7 +112,7 @@
                 childStrength = DefaultValuesHandler
                         .getDefaultChildStrength(model);
             }
-            newRelation.addProperty(KNOBOT.childStrength, childStrength);
+            newRelation.addProperty(KNOBOT.childStrength, model.createTypedLiteral(childStrength));
         } else {
             childStrength = 0; //so it does not try to aggregate the
             // source
@@ -120,8 +121,9 @@
                 .getParameter("minimumChildStrengthReduction");
         if ((childStrengthReduction != null)
                 && (!childStrengthReduction.equals(""))) {
-            newRelation.addProperty(KNOBOT.minimumChildStrengthReduction, Float
-                    .parseFloat(childStrengthReduction));
+            newRelation.addProperty(KNOBOT.minimumChildStrengthReduction, 
+					model.createTypedLiteral(Float
+                    .parseFloat(childStrengthReduction)));
         }
         newRelation.addProperty(KNOBOT.source, source);
         newRelation.addProperty(KNOBOT.target, target);

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/AntiAging.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/AntiAging.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/AntiAging.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -132,7 +132,7 @@
 				Literal effectiveDateLiteral = model.createTypedLiteral(new W3CDateFormat()
 		                .format(new Date()), XSDDatatype.XSDdateTime);
 				currentRelationRes.addProperty(KNOBOT.effectiveDate, effectiveDateLiteral);
-				currentRelationRes.addProperty(KNOBOT.strength, newStrength);
+				currentRelationRes.addProperty(KNOBOT.strength, model.createTypedLiteral(newStrength));
 			}
 		}
 		iter.close();

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/DefaultValuesHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/DefaultValuesHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/DefaultValuesHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -16,6 +16,7 @@
  */
 package org.wymiwyg.knobot.admin;
 
+import com.hp.hpl.jena.rdf.model.Literal;
 import org.wymiwyg.commons.jena.JenaUtil;
 import org.wymiwyg.commons.vocabulary.CALENDAR;
 import org.wymiwyg.rwcf.Handler;
@@ -30,6 +31,7 @@
 import com.hp.hpl.jena.rdf.model.Property;
 import com.hp.hpl.jena.rdf.model.ResIterator;
 import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.impl.LiteralImpl;
 import com.hp.hpl.jena.vocabulary.RDF;
 
 /**
@@ -112,10 +114,10 @@
 		model = config.getResource().getModel();
 		Resource defaultsResource = model.createResource(defaults);
 		if (!defaultsResource.hasProperty(defaultChildStrength)) {
-			defaultsResource.addProperty(defaultChildStrength, 0.9f);
+			defaultsResource.addProperty(defaultChildStrength, model.createTypedLiteral(0.9f));
 		}
 		if (!defaultsResource.hasProperty(defaultStrengthReduction)) {
-			defaultsResource.addProperty(defaultStrengthReduction, 0.001f);
+			defaultsResource.addProperty(defaultStrengthReduction, model.createTypedLiteral(0.001f));
 		}
 	}
 
@@ -199,7 +201,8 @@
 	 */
 	private static Resource getDefaultTimeZone() {
 		Model timeZoneData = ModelFactory.createDefaultModel();
-		timeZoneData.read(CALENDAR.class.getResource(
+		timeZoneData.read(CALENDAR.class.getResourceAsStream(
+				"timezones/time-zone-data.rdf"), CALENDAR.class.getResource(
 				"timezones/time-zone-data.rdf")
 				.toString());
 		Property offSetProperty = timeZoneData.createProperty("http://www.w3.org/2002/12/cal/icaltzd#tzoffsetto");

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/DefaultValuesPostHandler.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/DefaultValuesPostHandler.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/admin/DefaultValuesPostHandler.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -84,10 +84,10 @@
 		    itemPrototype.addProperty(RDF.type, KNOBOT.NonCommentable);
 		}
 		defaults.addProperty(DefaultValuesHandler.defaultMinimalRelevance, defaultMininmalRelevanceString);
-		defaults.addProperty(DefaultValuesHandler.defaultChildStrength, defaultChildStrength);
-		defaults.addProperty(DefaultValuesHandler.defaultStrengthReduction, defaultStrengthReduction);
+		defaults.addProperty(DefaultValuesHandler.defaultChildStrength, model.createTypedLiteral(defaultChildStrength));
+		defaults.addProperty(DefaultValuesHandler.defaultStrengthReduction, model.createTypedLiteral(defaultStrengthReduction));
 		defaults.addProperty(DefaultValuesHandler.notificationEmail, model.createResource(notificationEmail));
-		defaults.addProperty(DefaultValuesHandler.itemsPerTopic, itemsPerTopic);
+		defaults.addProperty(DefaultValuesHandler.itemsPerTopic, model.createTypedLiteral(itemsPerTopic));
 		Resource defaultTimeZone = model.createResource(defaultTimeZoneString);
 		defaultTimeZone.addProperty(RDF.type, CALENDAR.Vtimezone);
 		defaults.addProperty(DefaultValuesHandler.defaultTimeZone, defaultTimeZone);

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/aggregator/Aggregator.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/aggregator/Aggregator.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/aggregator/Aggregator.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -199,7 +199,7 @@
                                 * 60 * 1000;
                         aggregator.removeAll(AGGREGATOR.nextDownload);
                         aggregator.addProperty(AGGREGATOR.nextDownload,
-                                nextDownload);
+                                model.createTypedLiteral(nextDownload));
                         new Thread() {
                             public void run() {
                                 try {
@@ -577,7 +577,7 @@
                     newRelation.addProperty(KNOBOT.source, aggregated);
                     newRelation.addProperty(KNOBOT.target, target);
                     newRelation.addProperty(KNOBOT.strength, model.createTypedLiteral(1f));
-                    newRelation.addProperty(KNOBOT.strengthReduction, 0);
+                    newRelation.addProperty(KNOBOT.strengthReduction, model.createTypedLiteral(0));
                     Date effectiveDate = new Date();
                     String dateString = null;
                     if (target.hasProperty(DC.date)) {

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/relations/Relation.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/relations/Relation.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/relations/Relation.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -106,13 +106,13 @@
                 .format(new Date()), XSDDatatype.XSDdateTime);
 		result.addProperty(KNOBOT.effectiveDate, effectiveDateLiteral);
 		//result.addProperty(KNOBOT.effectiveDate, System.currentTimeMillis()); //!!getEffectiveDate());
-		result.addProperty(KNOBOT.strengthReduction, getStrengthReduction());
+		result.addProperty(KNOBOT.strengthReduction, model.createTypedLiteral(getStrengthReduction()));
 		//if (getComparativeStrength() > getStrength()) {
-			result.addProperty(KNOBOT.comparativeStrength, getCurrentComparativeStrength());
+			result.addProperty(KNOBOT.comparativeStrength, model.createTypedLiteral(getCurrentComparativeStrength()));
 		//}
 		result.addProperty(KNOBOT.minimumChildStrengthReduction,
-				getChildStrengthReduction());
-		result.addProperty(KNOBOT.childStrength, getCurrentChildStrength());
+				model.createTypedLiteral(getChildStrengthReduction()));
+		result.addProperty(KNOBOT.childStrength, model.createTypedLiteral(getCurrentChildStrength()));
 		Literal[] targetLabels = getTargetLabel();
 		if (targetLabels != null) {
 			for (int i = 0; i < targetLabels.length; i++) {
@@ -134,9 +134,9 @@
 				recommendation.addProperty(KNOBOT.recommender,
 						getRecommendations()[i].getRecommender());
 				recommendation.addProperty(KNOBOT.strengthAtSource,
-						getRecommendations()[i].getStrengthAtSource());
+						model.createTypedLiteral(getRecommendations()[i].getStrengthAtSource()));
 				recommendation.addProperty(KNOBOT.strengthOfRecommender,
-						getRecommendations()[i].getStrengthOfRecommender());
+						model.createTypedLiteral(getRecommendations()[i].getStrengthOfRecommender()));
 				result.addProperty(KNOBOT.recommendedBy, recommendation);
 			}
 		}

Modified: knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/relations/RelationManager.java
===================================================================
--- knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/relations/RelationManager.java	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/java/org/wymiwyg/knobot/relations/RelationManager.java	2009-01-02 18:38:45 UTC (rev 145)
@@ -165,7 +165,9 @@
 	public static void addMissingRelationOrderProperties(Model model) {
 		ResIterator relations = model.listSubjectsWithProperty(RDF.type,
 				KNOBOT.Relation);
+		int i = 0;
 		while (relations.hasNext()) {
+			log.info("processing relation "+i++);
 			Resource current = relations.nextResource();
 			if (!model.listSubjectsWithProperty(KNOBOT.nextRelation, current)
 					.hasNext()) {

Modified: knobot-topicspace/trunk/src/main/resources/META-INF/web/stylesheets/show-all-topics.xsl
===================================================================
--- knobot-topicspace/trunk/src/main/resources/META-INF/web/stylesheets/show-all-topics.xsl	2009-01-02 18:38:06 UTC (rev 144)
+++ knobot-topicspace/trunk/src/main/resources/META-INF/web/stylesheets/show-all-topics.xsl	2009-01-02 18:38:45 UTC (rev 145)
@@ -19,12 +19,11 @@
   xmlns:img="http://wymiwyg.org/ontologies/rss/image#" 
   xmlns:lang="http://wymiwyg.org/ontologies/language-selection#" 
   xmlns:attach="http://wymiwyg.org/ontologies/rss/attach#" 
-  xmlns:auth="http://wymiwyg.org/ontologies/authorization#"
   xmlns:foaf="http://xmlns.com/foaf/0.1/"
   xmlns:foafex="http://wymiwyg.org/ontologies/foaf/extensions#"
   xmlns="http://www.w3.org/1999/xhtml"
   exclude-result-prefixes="rdf rdfs dc dcterms ref rss knobot trans im content im annotate 
-  admin image cc reqv l img lang attach auth foaf foafex" 
+  admin image cc reqv l img lang attach foaf foafex" 
   version="1.0">
 
   <xsl:include href="r3x-util"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[144] rwcf-app-styling/trunk/pom.xml

From: <re...@us...> - 2009-01-02 18:38:11

Revision: 144
          http://knobot.svn.sourceforge.net/knobot/?rev=144&view=rev
Author:   rebach
Date:     2009-01-02 18:38:06 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
changes to run on trialox platform

Modified Paths:
--------------
    rwcf-app-styling/trunk/pom.xml

Modified: rwcf-app-styling/trunk/pom.xml
===================================================================
--- rwcf-app-styling/trunk/pom.xml	2008-10-31 19:08:43 UTC (rev 143)
+++ rwcf-app-styling/trunk/pom.xml	2009-01-02 18:38:06 UTC (rev 144)
@@ -3,10 +3,11 @@
 	<parent>
 		<groupId>org.wymiwyg.rwcf</groupId>
 		<artifactId>rwcf-apps</artifactId>
-		<version>0.0.1</version>
+		<version>0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rwcf-app-styling</artifactId>
-	<version>0.4</version>
+	<version>0.5-SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<description></description>
 </project>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] SF.net SVN: knobot:[143] rwcf-app-admin/trunk/src/main/java/org/wymiwyg/ rwcf/tools/admin/InitialConfiguration.java

From: <re...@us...> - 2008-10-31 19:08:48

Revision: 143
          http://knobot.svn.sourceforge.net/knobot/?rev=143&view=rev
Author:   rebach
Date:     2008-10-31 19:08:43 +0000 (Fri, 31 Oct 2008)

Log Message:
-----------
fix?

Modified Paths:
--------------
    rwcf-app-admin/trunk/src/main/java/org/wymiwyg/rwcf/tools/admin/InitialConfiguration.java

Modified: rwcf-app-admin/trunk/src/main/java/org/wymiwyg/rwcf/tools/admin/InitialConfiguration.java
===================================================================
--- rwcf-app-admin/trunk/src/main/java/org/wymiwyg/rwcf/tools/admin/InitialConfiguration.java	2008-04-28 15:39:04 UTC (rev 142)
+++ rwcf-app-admin/trunk/src/main/java/org/wymiwyg/rwcf/tools/admin/InitialConfiguration.java	2008-10-31 19:08:43 UTC (rev 143)
@@ -80,7 +80,7 @@
 			Resource transaction = resultModel
 					.createResource(TRANSACTION.Transaction);
 			transaction.addProperty(DC.description,
-					new EnhancedRequest(request).getRootURL());
+					new EnhancedRequest(request).getRootURL().toString());
 			response.setBody(resultModel);
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Knobot-cvs] Build failed in Hudson: bundle-loader » bundle-loader #9

From: <re...@gm...> - 2008-05-12 14:16:58

See http://integration.wymiwyg.org:9080/job/bundle-loader/org.wymiwyg$bundle-loader/9/changes

------------------------------------------

[Knobot-cvs] Build failed in Hudson: bundle-loader » bundle-loader #8

From: <re...@gm...> - 2008-04-28 16:38:23

See http://integration.wymiwyg.org:9080/job/bundle-loader/org.wymiwyg$bundle-loader/8/changes

------------------------------------------

[Knobot-cvs] Hudson build is back to normal: rwcf-apps » Unnamed - org.wymiwyg.rwcf:rwcf-apps:pom:0.0.1 #27

From: <re...@gm...> - 2008-04-28 16:30:04

See http://integration.wymiwyg.org:9080/job/rwcf-apps/org.wymiwyg.rwcf$rwcf-apps/27/changes

[Knobot-cvs] Hudson build is back to normal: rwcf-app-xslt » Unnamed - org.wymiwyg.rwcf:rwcf-app-xslt:jar:0.4 #38

From: <re...@gm...> - 2008-04-28 16:29:43

See http://integration.wymiwyg.org:9080/job/rwcf-app-xslt/org.wymiwyg.rwcf$rwcf-app-xslt/38/changes

[Knobot-cvs] Hudson build is back to normal: rwcf-app-webdav » Unnamed - org.wymiwyg.rwcf:rwcf-app-webdav:jar:0.4 #83

From: <re...@gm...> - 2008-04-28 16:28:59

See http://integration.wymiwyg.org:9080/job/rwcf-app-webdav/org.wymiwyg.rwcf$rwcf-app-webdav/83/changes

[Knobot-cvs] Hudson build is back to normal: rwcf-app-virtuser » Unnamed - org.wymiwyg.rwcf:rwcf-app-virtuser:jar:0.4 #36

From: <re...@gm...> - 2008-04-28 16:28:24

See http://integration.wymiwyg.org:9080/job/rwcf-app-virtuser/org.wymiwyg.rwcf$rwcf-app-virtuser/36/changes

[Knobot-cvs] Hudson build is back to normal: rwcf-app-template-setter » Unnamed - org.wymiwyg.rwcf:rwcf-app-template-setter:jar:0.4 #37

From: <re...@gm...> - 2008-04-28 16:27:27

See http://integration.wymiwyg.org:9080/job/rwcf-app-template-setter/org.wymiwyg.rwcf$rwcf-app-template-setter/37/changes

[Knobot-cvs] Hudson build is back to normal: rwcf-app-styling » Unnamed - org.wymiwyg.rwcf:rwcf-app-styling:jar:0.4 #36

From: <re...@gm...> - 2008-04-28 16:26:35

See http://integration.wymiwyg.org:9080/job/rwcf-app-styling/org.wymiwyg.rwcf$rwcf-app-styling/36/changes

[Knobot-cvs] Hudson build is back to normal: rwcf-app-redirection » Unnamed - org.wymiwyg.rwcf:rwcf-app-redirection:jar:0.4 #37

From: <re...@gm...> - 2008-04-28 16:26:15

See http://integration.wymiwyg.org:9080/job/rwcf-app-redirection/org.wymiwyg.rwcf$rwcf-app-redirection/37/changes

[Knobot-cvs] Hudson build is back to normal: rwcf-app-rdf-insertion » Unnamed - org.wymiwyg.rwcf:rwcf-app-rdf-insertion:jar:0.4 #37

From: <re...@gm...> - 2008-04-28 16:25:05

See http://integration.wymiwyg.org:9080/job/rwcf-app-rdf-insertion/org.wymiwyg.rwcf$rwcf-app-rdf-insertion/37/changes

Flat | Threaded

1 2 3 .. 39 > >> (Page 1 of 39)

2006	Jan	Feb	Mar	Apr	May	Jun	Jul (26)	Aug (60)	Sep (256)	Oct (98)	Nov (4)	Dec (5)
2007	Jan (1)	Feb (101)	Mar (11)	Apr (5)	May (16)	Jun (22)	Jul (5)	Aug (5)	Sep (43)	Oct	Nov	Dec
2008	Jan (2)	Feb (157)	Mar (71)	Apr (63)	May (1)	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2009	Jan (14)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec