You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2014/05/19 15:38:46 UTC
svn commit: r1595902 - in /stanbol/branches/release-0.12:
commons/marmotta/kiwi/
commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/
commons/marmotta/kiwi/src/main/resources/
commons/marmotta/kiwi/src/main/resources/schema/ en...
Author: rwesten
Date: Mon May 19 13:38:45 2014
New Revision: 1595902
URL: http://svn.apache.org/r1595902
Log:
STANBOL-1169 and STANBOL-1245: added license headers and some other minor corrections
Modified:
stanbol/branches/release-0.12/commons/marmotta/kiwi/ (props changed)
stanbol/branches/release-0.12/commons/marmotta/kiwi/pom.xml
stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java
stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml
stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml
stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml
stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd
stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java
stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/resources/OSGI-INF/metatype/metatype.properties
stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/ (props changed)
stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml
Propchange: stanbol/branches/release-0.12/commons/marmotta/kiwi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 19 13:38:45 2014
@@ -0,0 +1,7 @@
+.settings
+
+target
+
+.project
+
+.classpath
Modified: stanbol/branches/release-0.12/commons/marmotta/kiwi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/marmotta/kiwi/pom.xml?rev=1595902&r1=1595901&r2=1595902&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/marmotta/kiwi/pom.xml (original)
+++ stanbol/branches/release-0.12/commons/marmotta/kiwi/pom.xml Mon May 19 13:38:45 2014
@@ -1,14 +1,20 @@
<?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. -->
+<!--
+ 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/maven-v4_0_0.xsd">
@@ -32,10 +38,6 @@
<inceptionYear>2014</inceptionYear>
- <!-- properties>
- <sling.url>http://localhost:8180/system/console</sling.url>
- </properties -->
-
<build>
<plugins>
<plugin>
Modified: stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java?rev=1595902&r1=1595901&r2=1595902&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java (original)
+++ stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java Mon May 19 13:38:45 2014
@@ -1,12 +1,25 @@
+/*
+* 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.
+*/
package org.apache.stanbol.commons.marmotta.kiwi;
import java.util.Arrays;
import java.util.Dictionary;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.StrLookup;
Modified: stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml?rev=1595902&r1=1595901&r2=1595902&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml (original)
+++ stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml Mon May 19 13:38:45 2014
@@ -1,3 +1,24 @@
+<?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.
+ -->
+<!--
+ NOTE: jgroups configuration required by Infinispan Caching Option. Need to
+ be in this module as otherwise loading this resource in OSGI fails.
+ -->
<config xmlns="urn:org:jgroups"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.4.xsd">
Modified: stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml?rev=1595902&r1=1595901&r2=1595902&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml (original)
+++ stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml Mon May 19 13:38:45 2014
@@ -1,3 +1,24 @@
+<?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.
+ -->
+<!--
+ NOTE: jgroups configuration required by Infinispan Caching Option. Need to
+ be in this module as otherwise loading this resource in OSGI fails.
+ -->
<config xmlns="urn:org:jgroups"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.4.xsd">
Modified: stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml?rev=1595902&r1=1595901&r2=1595902&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml (original)
+++ stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml Mon May 19 13:38:45 2014
@@ -1,3 +1,24 @@
+<?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.
+ -->
+<!--
+ NOTE: jgroups configuration required by Infinispan Caching Option. Need to
+ be in this module as otherwise loading this resource in OSGI fails.
+ -->
<config xmlns="urn:org:jgroups"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.4.xsd">
Modified: stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd?rev=1595902&r1=1595901&r2=1595902&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd (original)
+++ stanbol/branches/release-0.12/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd Mon May 19 13:38:45 2014
@@ -1,4 +1,24 @@
<?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.
+ -->
+<!--
+ NOTE: Infinispan configuration required by the Infinispan Caching Option.
+ Need to be in this module as otherwise loading this resource in OSGI fails.
+ -->
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:6.0" xmlns:tns="urn:infinispan:config:6.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="infinispan">
Modified: stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java?rev=1595902&r1=1595901&r2=1595902&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java (original)
+++ stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java Mon May 19 13:38:45 2014
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.entityhub.yard.sesame.impl;
import org.apache.felix.scr.annotations.Activate;
Modified: stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1595902&r1=1595901&r2=1595902&view=diff
==============================================================================
--- stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/resources/OSGI-INF/metatype/metatype.properties Mon May 19 13:38:45 2014
@@ -14,7 +14,7 @@
# limitations under the License.
#===============================================================================
-#Properties and Options used to configure EnhancerWebFragment
+#Properties and Options used to configure the SesameYardComponent
#===============================================================================
org.apache.stanbol.entityhub.yard.sesame.impl.SesameYardComponent.name=Apache \
Propchange: stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 19 13:38:45 2014
@@ -0,0 +1,5 @@
+target
+
+.settings
+
+.project
Modified: stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml?rev=1595902&r1=1595901&r2=1595902&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml Mon May 19 13:38:45 2014
@@ -1,16 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- (c) 2013 Redlink GmbH. All rights reserved.
+<!--
+ 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.
-->
<bundles>
<!-- logback logging is used by Sesame and Marmotta -->
<startLevel level="10">
- <bundle>
+ <bundle> <!-- sesame dependency -->
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>0.9.30</version> <!-- sesame expects version < 1.0.0 -->
</bundle>
- <bundle>
+ <bundle> <!-- sesame dependency -->
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.30</version> <!-- sesame expects version < 1.0.0 -->
@@ -18,7 +31,7 @@
</startLevel>
<startLevel level="21">
- <bundle>
+ <bundle>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>commons-digester</artifactId>
<version>1.8_1</version>
@@ -48,12 +61,12 @@
<artifactId>java-uuid-generator</artifactId>
<version>3.1.3</version>
</bundle>
- <bundle> <!-- opencsv version 2.1 -->
+ <bundle> <!-- opencsv version 2.1 (sesame dependency) -->
<groupId>org.ow2.bundles</groupId>
<artifactId>ow2-bundles-externals-opencsv</artifactId>
<version>1.0.36</version>
</bundle>
- <bundle>
+ <bundle> <!-- sesame dependency -->
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.3.1</version>
@@ -156,7 +169,7 @@
<artifactId>h2</artifactId>
<version>1.4.178</version>
</bundle>
- <bundle>
+ <bundle> <!-- required by the H2 driver -->
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
<version>4.2.0</version>