diff --git a/tasklist-blueprint-cdi/angular-ui/.gitignore b/tasklist-blueprint-cdi/angular-ui/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/tasklist-blueprint-cdi/angular-ui/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/tasklist-blueprint-cdi/angular-ui/osgi.bnd b/tasklist-blueprint-cdi/angular-ui/osgi.bnd
new file mode 100644
index 0000000..469444b
--- /dev/null
+++ b/tasklist-blueprint-cdi/angular-ui/osgi.bnd
@@ -0,0 +1 @@
+Web-ContextPath: /tasklist
diff --git a/tasklist-blueprint-cdi/angular-ui/pom.xml b/tasklist-blueprint-cdi/angular-ui/pom.xml
new file mode 100644
index 0000000..688875b
--- /dev/null
+++ b/tasklist-blueprint-cdi/angular-ui/pom.xml
@@ -0,0 +1,18 @@
+
+
+
+ 4.0.0
+
+
+ tasklist-blueprint-cdi
+ net.lr.tasklist.cdi
+ 1.0.0-SNAPSHOT
+
+
+ tasklist-angular-ui
+ bundle
+
+ tasklist-angular-ui
+ angular-ui web bundle
+
+
diff --git a/tasklist-blueprint-cdi/angular-ui/src/main/resources/app.js b/tasklist-blueprint-cdi/angular-ui/src/main/resources/app.js
new file mode 100644
index 0000000..d9d2da9
--- /dev/null
+++ b/tasklist-blueprint-cdi/angular-ui/src/main/resources/app.js
@@ -0,0 +1,37 @@
+(function() {
+ var app = angular.module('myApp', []);
+ app.factory("Post", function($resource) {
+ return $resource("/cxf/tasklistRest");
+ });
+
+ app.controller('TaskController', function($scope, $http) {
+ $scope.task = {};
+ $scope.reload = function() {
+ $http.get("/cxf/tasklistRest")
+ .success(function (response) {$scope.tasks = response.task;});
+ };
+
+ $scope.put = function() {
+ var toSend = {task: $scope.task};
+ $http.put("/cxf/tasklistRest/" + $scope.task.id, toSend)
+ .success(function (response) {$scope.reload();});
+
+ this.task = {};
+ };
+
+ $scope.delete = function(id) {
+ $http.delete("/cxf/tasklistRest/"+ id)
+ .success(function (response) {$scope.reload();});
+ $scope.task = {};
+ }
+
+ $scope.select = function(id) {
+ $scope.task = $scope.tasks[id];
+ }
+
+ $scope.newTask = function(id) {
+ $scope.task = {};
+ }
+ $scope.reload();
+ });
+})();
diff --git a/tasklist-blueprint-cdi/angular-ui/src/main/resources/index.html b/tasklist-blueprint-cdi/angular-ui/src/main/resources/index.html
new file mode 100644
index 0000000..d317015
--- /dev/null
+++ b/tasklist-blueprint-cdi/angular-ui/src/main/resources/index.html
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+Tasks
+
+
+
+
+
+
+
+
+
+
+ Del |
+ Id |
+ Title |
+ Description |
+
+
+
+
+ |
+ {{t.id}} |
+ {{t.title}} |
+ {{t.description}} |
+
+
+
+
+
+
+
Task
+
+
+
+
+
+
+
diff --git a/tasklist-blueprint-cdi/features/src/main/resources/features.xml b/tasklist-blueprint-cdi/features/src/main/resources/features.xml
index 275fc89..e7c7628 100644
--- a/tasklist-blueprint-cdi/features/src/main/resources/features.xml
+++ b/tasklist-blueprint-cdi/features/src/main/resources/features.xml
@@ -1,6 +1,6 @@
- mvn:org.apache.cxf.karaf/apache-cxf/3.1.1/xml/features
+ mvn:org.apache.cxf.karaf/apache-cxf/3.1.3/xml/features
mvn:org.ops4j.pax.jdbc/pax-jdbc-features/0.7.0/xml/features
@@ -21,12 +21,17 @@
+ cxf-features-logging
cxf-jaxrs
mvn:net.lr.tasklist.cdi/tasklist-service/${pom.version}
-
+ war
+ mvn:net.lr.tasklist.cdi/tasklist-angular-ui/${pom.version}
+
+
+
http
http-whiteboard
mvn:net.lr.tasklist.cdi/tasklist-model/${pom.version}
diff --git a/tasklist-blueprint-cdi/model/osgi.bnd b/tasklist-blueprint-cdi/model/osgi.bnd
new file mode 100644
index 0000000..dbeb3e8
--- /dev/null
+++ b/tasklist-blueprint-cdi/model/osgi.bnd
@@ -0,0 +1,6 @@
+Meta-Persistence: \
+ META-INF/persistence.xml
+Import-Package: \
+ org.hibernate.proxy, \
+ javassist.util.proxy, \
+ *
diff --git a/tasklist-blueprint-cdi/model/pom.xml b/tasklist-blueprint-cdi/model/pom.xml
index d07baed..8e6cf39 100644
--- a/tasklist-blueprint-cdi/model/pom.xml
+++ b/tasklist-blueprint-cdi/model/pom.xml
@@ -1,31 +1,16 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- 4.0.0
-
- net.lr.tasklist.cdi
- 1.0.0-SNAPSHOT
- tasklist-blueprint-cdi
- ..
-
+ 4.0.0
+
+ net.lr.tasklist.cdi
+ 1.0.0-SNAPSHOT
+ tasklist-blueprint-cdi
+ ..
+
- bundle
- tasklist-model
+ bundle
+ tasklist-model
-
-
-
- org.apache.felix
- maven-bundle-plugin
-
-
- META-INF/persistence.xml
-
- *, org.hibernate.proxy, javassist.util.proxy
-
-
-
-
-
diff --git a/tasklist-blueprint-cdi/persistence/osgi.bnd b/tasklist-blueprint-cdi/persistence/osgi.bnd
new file mode 100644
index 0000000..67edb3b
--- /dev/null
+++ b/tasklist-blueprint-cdi/persistence/osgi.bnd
@@ -0,0 +1 @@
+-dsannotations: *
diff --git a/tasklist-blueprint-cdi/persistence/pom.xml b/tasklist-blueprint-cdi/persistence/pom.xml
index 7a85e4e..4850802 100644
--- a/tasklist-blueprint-cdi/persistence/pom.xml
+++ b/tasklist-blueprint-cdi/persistence/pom.xml
@@ -50,16 +50,6 @@
-
- org.apache.felix
- maven-bundle-plugin
- 2.5.3
- true
-
-
-
-
-
diff --git a/tasklist-blueprint-cdi/pom.xml b/tasklist-blueprint-cdi/pom.xml
index 05502e4..45e6f85 100644
--- a/tasklist-blueprint-cdi/pom.xml
+++ b/tasklist-blueprint-cdi/pom.xml
@@ -1,8 +1,5 @@
-
+
4.0.0
@@ -22,7 +19,8 @@
ui
features
tasklist-service
-
+ angular-ui
+
@@ -116,9 +114,13 @@
maven-bundle-plugin
3.0.0
true
+
+
+ <_include>osgi.bnd
+
+
-
-
+
\ No newline at end of file
diff --git a/tasklist-blueprint-cdi/tasklist-service/osgi.bnd b/tasklist-blueprint-cdi/tasklist-service/osgi.bnd
new file mode 100644
index 0000000..67edb3b
--- /dev/null
+++ b/tasklist-blueprint-cdi/tasklist-service/osgi.bnd
@@ -0,0 +1 @@
+-dsannotations: *
diff --git a/tasklist-blueprint-cdi/tasklist-service/pom.xml b/tasklist-blueprint-cdi/tasklist-service/pom.xml
index f9c0d85..570b559 100644
--- a/tasklist-blueprint-cdi/tasklist-service/pom.xml
+++ b/tasklist-blueprint-cdi/tasklist-service/pom.xml
@@ -55,16 +55,6 @@
-
- org.apache.felix
- maven-bundle-plugin
- 2.5.3
- true
-
-
-
-
-
diff --git a/tasklist-blueprint-cdi/tasklist-service/src/main/java/net/lr/tasklist/service/impl/TaskServiceRestExporter.java b/tasklist-blueprint-cdi/tasklist-service/src/main/java/net/lr/tasklist/service/impl/TaskServiceRestExporter.java
index a0f0066..70a77c2 100644
--- a/tasklist-blueprint-cdi/tasklist-service/src/main/java/net/lr/tasklist/service/impl/TaskServiceRestExporter.java
+++ b/tasklist-blueprint-cdi/tasklist-service/src/main/java/net/lr/tasklist/service/impl/TaskServiceRestExporter.java
@@ -1,5 +1,7 @@
package net.lr.tasklist.service.impl;
+import static java.util.Collections.singletonList;
+
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
@@ -7,6 +9,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.ext.logging.LoggingFeature;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
@Singleton
@@ -25,6 +28,7 @@ public void create() {
factory.setAddress("/tasklistRest");
factory.setServiceBean(taskServiceRest);
factory.setBus(bus);
+ factory.setFeatures(singletonList(new LoggingFeature()));
server = factory.create();
server.start();
}
diff --git a/tasklist-blueprint-cdi/ui/osgi.bnd b/tasklist-blueprint-cdi/ui/osgi.bnd
new file mode 100644
index 0000000..e69de29