clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [3/3] clerezza git commit: CLEREZZA-989: added reactor for release, and some fixed for things to compile
Date Mon, 18 May 2015 20:47:07 GMT
CLEREZZA-989: added reactor for release, and some fixed for things to compile

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/62fc1344
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/62fc1344
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/62fc1344

Branch: refs/heads/master
Commit: 62fc13444a46755481952c776be0e48c631750c5
Parents: e737231
Author: Reto Gmuer <reto@apache.org>
Authored: Mon May 18 20:09:28 2015 +0000
Committer: Reto Gmuer <reto@apache.org>
Committed: Mon May 18 20:09:28 2015 +0000

----------------------------------------------------------------------
 platform/config/pom.xml                         |  2 +-
 platform/typerendering.seedsnipe/pom.xml        |  8 +++++
 .../seedsnipe/SeedsnipeRenderlet.java           |  6 ++--
 provisioning/site.tools/pom.xml                 |  2 +-
 .../apache/clerezza/rdf/web/core/Restorer.java  |  2 +-
 .../rdf/web/core/BackupAndRestoreTest.java      | 12 ++++++--
 releases/201505/pom.xml                         | 31 +++++++++++++++++++-
 tools.offline/pom.xml                           |  2 +-
 8 files changed, 56 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/62fc1344/platform/config/pom.xml
----------------------------------------------------------------------
diff --git a/platform/config/pom.xml b/platform/config/pom.xml
index 1186837..c7e82e4 100644
--- a/platform/config/pom.xml
+++ b/platform/config/pom.xml
@@ -46,7 +46,7 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <!-- a problem with more recent versions and combined targets target="(&amp;(foo=bar)(name=foo)"
 -->
-                <version>2.5.0</version>
+                <version>2.4.0</version>
             </plugin>
         </plugins>
     </build>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/62fc1344/platform/typerendering.seedsnipe/pom.xml
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/pom.xml b/platform/typerendering.seedsnipe/pom.xml
index 1637f4f..dd11282 100644
--- a/platform/typerendering.seedsnipe/pom.xml
+++ b/platform/typerendering.seedsnipe/pom.xml
@@ -33,6 +33,14 @@
     <version>1.0.0-SNAPSHOT</version>
     <name>Clerezza - Platform Seedsnipe Renderlet</name>
     <description>Renderlet implementation wrapping org.apache.clerezza.templating.seedsnipe</description>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/62fc1344/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java
b/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java
index 80d8c1a..5a7025a 100644
--- a/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java
+++ b/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/SeedsnipeRenderlet.java
@@ -30,15 +30,17 @@ import org.apache.clerezza.platform.typerendering.Renderlet;
 import org.apache.clerezza.rdf.utils.GraphNode;
 import org.apache.clerezza.templating.RenderingFunctions;
 import org.apache.clerezza.templating.seedsnipe.simpleparser.SeedsnipeTemplatingEngine;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
 
 /**
  * Renderlet for Seedsnipe
  *
  * @author mir
  *
- * @scr.component
- * @scr.service interface="org.apache.clerezza.platform.typerendering.Renderlet"
  */
+@Component
+@Service(Renderlet.class)
 public class SeedsnipeRenderlet implements Renderlet{
 
     private SeedsnipeTemplatingEngine seedsnipeEngine;

http://git-wip-us.apache.org/repos/asf/clerezza/blob/62fc1344/provisioning/site.tools/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/site.tools/pom.xml b/provisioning/site.tools/pom.xml
index 026437b..225f6ce 100644
--- a/provisioning/site.tools/pom.xml
+++ b/provisioning/site.tools/pom.xml
@@ -26,7 +26,7 @@
         <artifactId>clerezza</artifactId>
         <groupId>org.apache.clerezza</groupId>
         <version>7-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath>../../parent</relativePath>
     </parent>
     
     <groupId>org.apache.clerezza.provisioning</groupId>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/62fc1344/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
index 728be7a..2df6c4d 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
@@ -130,7 +130,7 @@ public class Restorer {
                 Graph mGraph;
                 boolean created = false;
                 try {
-                    mGraph = target.getGraph((IRI)graphGN.getNode());
+                    mGraph = target.getMGraph((IRI)graphGN.getNode());
                     try {
                         mGraph.clear();
                     } catch (UnsupportedOperationException ex) {

http://git-wip-us.apache.org/repos/asf/clerezza/blob/62fc1344/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
b/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
index ca785be..0c97be8 100644
--- a/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
+++ b/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
@@ -157,13 +157,21 @@ public class BackupAndRestoreTest {
     public void restoreFromBackup() throws IOException {
         byte[] backupData = backup.createBackup();
         TcProvider tcProvider = EasyMock.createMock(TcProvider.class);
-        EasyMock.expect(tcProvider.getGraph(testGraphUri0)).andReturn(
+        EasyMock.expect(tcProvider.getMGraph(testGraphUri0)).andReturn(
                 EasyMock.createNiceMock(Graph.class));
-        EasyMock.expect(tcProvider.getGraph(testGraphUri1)).andReturn(
+        EasyMock.expect(tcProvider.getMGraph(testGraphUri1)).andReturn(
+                EasyMock.createNiceMock(Graph.class));
+        EasyMock.expect(tcProvider.getMGraph(testGraphUriA)).andReturn(
                 EasyMock.createNiceMock(Graph.class));
         tcProvider.deleteGraph(testGraphUriA);
+        tcProvider.deleteGraph(testGraphUri0);
+        tcProvider.deleteGraph(testGraphUri1);
         EasyMock.expect(tcProvider.createImmutableGraph(EasyMock.eq(testGraphUriA),
                 EasyMock.notNull(Graph.class))).andReturn(new SimpleGraph().getImmutableGraph());
+        EasyMock.expect(tcProvider.createImmutableGraph(EasyMock.eq(testGraphUri0),
+                EasyMock.notNull(Graph.class))).andReturn(new SimpleGraph().getImmutableGraph());
+        EasyMock.expect(tcProvider.createImmutableGraph(EasyMock.eq(testGraphUri1),
+                EasyMock.notNull(Graph.class))).andReturn(new SimpleGraph().getImmutableGraph());
         EasyMock.replay(tcProvider);
         Restorer restore = new Restorer();
         restore.parser = Parser.getInstance();

http://git-wip-us.apache.org/repos/asf/clerezza/blob/62fc1344/releases/201505/pom.xml
----------------------------------------------------------------------
diff --git a/releases/201505/pom.xml b/releases/201505/pom.xml
index 2c14fee..e716557 100644
--- a/releases/201505/pom.xml
+++ b/releases/201505/pom.xml
@@ -43,12 +43,21 @@
     <name>Clerezza - Release 201505</name>
 
     <modules>
+        <module>../../jaxrs.rdf.providers</module>
+        <module>../../rdf</module>
+        <module>../../templating</module>
+        <module>../../templating.seedsnipe</module>
         <module>../../parent</module>
         <module>../../platform/config</module>
         <module>../../platform/config.gui</module>
         <module>../../platform/content</module>
         <module>../../platform/content.default404</module>
         <module>../../platform/content.fsadaptor</module>
+        <module>../../platform/globalmenu.api</module>
+        <module>../../platform/platform</module>
+        <module>../../platform/style.default</module>
+        <module>../../platform/typehandlerspace</module>
+        <module>../../platform/typehandlerspace.jaxrs2</module>
         <module>../../platform/typerendering</module>
         <module>../../platform/typerendering.scala</module>
         <module>../../platform/typerendering.scalaserverpages</module>
@@ -60,8 +69,28 @@
         <module>../../platform/documentation</module>
         <module>../../platform/documentation.viewer</module>
         <module>../../platform/users</module>
+        <module>../../platform/usermanager</module>
         <module>../../platform/typepriority</module>
-        <module>../../rdf</module>
+        <module>../../provisioning/felixosgi</module>
+        <module>../../provisioning/felixweb</module>
+        <!-- <module>../../provisioning/security</module> -->
+        <module>../../provisioning/jaxrs-whiteboard</module>
+        <module>../../provisioning/launchers/content-launcher</module>
+        <module>../../provisioning/launchers/linked-data-launcher</module>
+        <module>../../provisioning/launchers/typerendering-launcher</module>
+        <module>../../provisioning/launchers/website-launcher</module>
+        <module>../../provisioning/platform.content</module>
+        <module>../../provisioning/platform.graphnodeprovider</module>
+        <module>../../provisioning/rdf</module>
+        <module>../../provisioning/rdf.tdb</module>
+        <module>../../provisioning/rdf.web</module>
+        <module>../../provisioning/site.tools</module>
+        <module>../../provisioning/typehandlerspace</module>
+        <module>../../provisioning/typerendering</module>
+        <module>../../scala-scripting</module>
+        <module>../../site</module>
+        <module>../../tools.offline</module>
+        <module>../../web.fileserver</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/62fc1344/tools.offline/pom.xml
----------------------------------------------------------------------
diff --git a/tools.offline/pom.xml b/tools.offline/pom.xml
index f1022b5..121fc5b 100644
--- a/tools.offline/pom.xml
+++ b/tools.offline/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>utils</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>0.2</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file


Mime
View raw message