You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dg...@apache.org on 2018/09/10 15:38:15 UTC
incubator-unomi git commit: UNOMI-187 create bundle to implement web
tracker
Repository: incubator-unomi
Updated Branches:
refs/heads/master 8a9559ce6 -> fc2eefc2e
UNOMI-187 create bundle to implement web tracker
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/fc2eefc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/fc2eefc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/fc2eefc2
Branch: refs/heads/master
Commit: fc2eefc2e609ca9b44f0cf31ab8826951ae903be
Parents: 8a9559c
Author: dgaillard <dg...@jahia.com>
Authored: Mon Sep 10 17:38:07 2018 +0200
Committer: dgaillard <dg...@jahia.com>
Committed: Mon Sep 10 17:38:07 2018 +0200
----------------------------------------------------------------------
extensions/pom.xml | 1 +
extensions/web-tracker/README.md | 24 ++++++
extensions/web-tracker/core/pom.xml | 73 ++++++++++++++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 22 ++++++
.../src/main/resources/messages_en.properties | 16 ++++
extensions/web-tracker/karaf-kar/pom.xml | 79 ++++++++++++++++++++
.../karaf-kar/src/main/feature/feature.xml | 28 +++++++
extensions/web-tracker/pom.xml | 36 +++++++++
kar/pom.xml | 5 ++
kar/src/main/feature/feature.xml | 1 +
package/pom.xml | 10 +++
.../resources/OSGI-INF/blueprint/blueprint.xml | 1 +
12 files changed, 296 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 335229f..975c28c 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -38,6 +38,7 @@
<module>salesforce-connector</module>
<module>unomi-mailchimp</module>
<module>weather-update</module>
+ <module>web-tracker</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/extensions/web-tracker/README.md
----------------------------------------------------------------------
diff --git a/extensions/web-tracker/README.md b/extensions/web-tracker/README.md
new file mode 100644
index 0000000..ae99847
--- /dev/null
+++ b/extensions/web-tracker/README.md
@@ -0,0 +1,24 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+
+Apache Unomi Web Tracker
+=================================
+
+This extension is providing the web tracker to start collecting visitors data on your website
+
+## Getting started
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/extensions/web-tracker/core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/web-tracker/core/pom.xml b/extensions/web-tracker/core/pom.xml
new file mode 100755
index 0000000..d29df77
--- /dev/null
+++ b/extensions/web-tracker/core/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-web-tracker</artifactId>
+ <version>1.4.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>unomi-web-tracker-core</artifactId>
+ <name>Apache Unomi :: Extension :: Web Tracker :: Core</name>
+ <description>This is a simple Apache Unomi plugin.</description>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Import-Package>
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/extensions/web-tracker/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/web-tracker/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/web-tracker/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100755
index 0000000..325170a
--- /dev/null
+++ b/extensions/web-tracker/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+ xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
+</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/extensions/web-tracker/core/src/main/resources/messages_en.properties
----------------------------------------------------------------------
diff --git a/extensions/web-tracker/core/src/main/resources/messages_en.properties b/extensions/web-tracker/core/src/main/resources/messages_en.properties
new file mode 100755
index 0000000..86094c8
--- /dev/null
+++ b/extensions/web-tracker/core/src/main/resources/messages_en.properties
@@ -0,0 +1,16 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/extensions/web-tracker/karaf-kar/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/web-tracker/karaf-kar/pom.xml b/extensions/web-tracker/karaf-kar/pom.xml
new file mode 100644
index 0000000..8b3e21b
--- /dev/null
+++ b/extensions/web-tracker/karaf-kar/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-web-tracker</artifactId>
+ <version>1.4.0-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-web-tracker-karaf-kar</artifactId>
+ <name>Apache Unomi :: Extension :: Web Tracker :: Apache Karaf Feature and KAR archive</name>
+ <description>This is a simple Apache Unomi plugin.</description>
+ <packaging>kar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>1.4.0-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-web-tracker-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <includeTransitiveDependency>false</includeTransitiveDependency>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <configuration>
+ <startLevel>85</startLevel>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/extensions/web-tracker/karaf-kar/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/extensions/web-tracker/karaf-kar/src/main/feature/feature.xml b/extensions/web-tracker/karaf-kar/src/main/feature/feature.xml
new file mode 100644
index 0000000..5835a41
--- /dev/null
+++ b/extensions/web-tracker/karaf-kar/src/main/feature/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="unomi-web-tracker-karaf-feature">
+ <feature name="unomi-web-tracker-karaf-kar" version="${project.version}"
+ description="Apache Unomi :: Extensions :: Web Tracker :: Apache Karaf Feature">
+ <details>Apache Karaf feature for the Apache Unomi Context Server extension that provide the web tracker.</details>
+ <!--<configfile finalname="/etc/org.apache.unomi.webTracker.cfg">mvn:org.apache.unomi/unomi-weather-update-core/${project-->
+ <!--.version}/cfg/weatherupdatecfg</configfile>-->
+ <bundle start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore-osgi.version}</bundle>
+ <bundle start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient-osgi.version}</bundle>
+ <bundle start-level="85">mvn:org.apache.unomi/unomi-web-tracker-core/${project.version}</bundle>
+ </feature>
+</features>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/extensions/web-tracker/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/web-tracker/pom.xml b/extensions/web-tracker/pom.xml
new file mode 100644
index 0000000..2a77baa
--- /dev/null
+++ b/extensions/web-tracker/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-extensions</artifactId>
+ <version>1.4.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>unomi-web-tracker</artifactId>
+ <name>Apache Unomi :: Extension :: Web Tracker</name>
+ <description>Apache Unomi Context Server to provide the web tracker</description>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>core</module>
+ <module>karaf-kar</module>
+ </modules>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 90a27f9..f08049c 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -144,6 +144,11 @@
<type>xml</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-web-tracker-core</artifactId>
+ <version>1.4.0-incubating-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/kar/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml
index 3e74eb7..182cbb3 100644
--- a/kar/src/main/feature/feature.xml
+++ b/kar/src/main/feature/feature.xml
@@ -63,6 +63,7 @@
<bundle start-level="85" start="false">mvn:org.apache.unomi/unomi-plugins-optimization-test/${project.version}</bundle>
<bundle start-level="85" start="false">mvn:org.apache.unomi/cxs-lists-extension-actions/${project.version}</bundle>
<bundle start-level="85" start="false">mvn:org.apache.unomi/shell-dev-commands/${project.version}</bundle>
+ <bundle start-level="85" start="false">mvn:org.apache.unomi/unomi-web-tracker-core/${project.version}</bundle>
<bundle start-level="99">mvn:org.apache.unomi/shell-commands/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index b340cfc..10a7744 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -108,6 +108,15 @@
<dependency>
<groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-web-tracker-karaf-kar</artifactId>
+ <version>1.4.0-incubating-SNAPSHOT</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
<artifactId>unomi-itests</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
<classifier>features</classifier>
@@ -332,6 +341,7 @@
<feature>shell-compat</feature>
<feature>unomi-kar</feature>
<feature>unomi-router-karaf-feature</feature>
+ <feature>unomi-web-tracker-karaf-kar</feature>
</bootFeatures>
<libraries>
<library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version};type:=endorsed;export:=true;delegate:=true</library>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fc2eefc2/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 14ba1ce..e658c59 100644
--- a/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/tools/shell-commands/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -79,6 +79,7 @@
<value>org.apache.unomi.router-service</value>
<value>org.apache.unomi.router-rest</value>
<value>org.apache.unomi.shell-dev-commands</value>
+ <value>org.apache.unomi.web-tracker-core</value>
</list>
</property>
<property name="bundleContext" ref="blueprintBundleContext"/>