Author: suat
Date: Fri Jul 20 06:32:50 2012
New Revision: 1363664
URL: http://svn.apache.org/viewvc?rev=1363664&view=rev
Log:
STANBOL-471: Added missing license headers, etc to obtain the rat compatibility
Added:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/license/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/license/THIRD-PARTY.properties
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/resources/README
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/license/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/license/THIRD-PARTY.properties
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/doc/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/doc/storeRestApi.ftl
- copied, changed from r1363343,
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/storeRestApi.ftl
Removed:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/storeRestApi.ftl
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/license/THIRD-PARTY.properties
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/license/THIRD-PARTY.properties
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/license/THIRD-PARTY.properties
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/license/THIRD-PARTY.properties
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/EndpointType.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexException.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexState.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/SemanticIndex.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/store/ChangeSet.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/file/src/license/THIRD-PARTY.properties
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/index/ldpath/LDPathSemanticIndexTest.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartDeserializerTest.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartSerializerTest.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/FileStoreTest.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/license/THIRD-PARTY.properties
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
Fri Jul 20 06:32:50 2012
@@ -48,6 +48,20 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- AL20 licensed -->
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
+
+ <!-- AL20 licensed files. See src/main/resources/README -->
+
<exclude>src/main/resources/config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config</exclude>
+
<exclude>src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Added:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/license/THIRD-PARTY.properties?rev=1363664&view=auto
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/license/THIRD-PARTY.properties
(added)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/license/THIRD-PARTY.properties
Fri Jul 20 06:32:50 2012
@@ -0,0 +1,36 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - BSD-style
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
+# - ICU License
+# - MIT License
+# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Thu Jul 19 18:23:45 EEST 2012
+antlr--antlr--2.7.2=Public Domain
+asm--asm--3.1=BSD License
+commons-beanutils--commons-beanutils--1.7.0=The Apache Software License,
Version 2.0
+dom4j--dom4j--1.1=BSD-style
+jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
+javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License
(CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
+org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
+org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
+org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
+oro--oro--2.0.8=The Apache Software License, Version 2.0
+xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Added:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/resources/README
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/resources/README?rev=1363664&view=auto
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/resources/README
(added)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/resources/README
Fri Jul 20 06:32:50 2012
@@ -0,0 +1,20 @@
+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.
+
+The following files are provided under the Apache License, Version 2.0:
+
+config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config
+config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config
+
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/license/THIRD-PARTY.properties?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/license/THIRD-PARTY.properties
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/license/THIRD-PARTY.properties
Fri Jul 20 06:32:50 2012
@@ -1,30 +1,33 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - Apache License
-# - Apache Software License, Version 1.1
-# - BSD
-# - BSD-style license
-# - CDDL 1.1
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
-# - GPL2 w/ CPE
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - BSD-style
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:03:22 CET 2012
+#Fri Jul 20 09:15:13 EEST 2012
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License,
Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=Common Development And Distribution License
(CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License
(CDDL), Version 1.0
org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/license/THIRD-PARTY.properties?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/license/THIRD-PARTY.properties
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/license/THIRD-PARTY.properties
Fri Jul 20 06:32:50 2012
@@ -12,15 +12,17 @@
# - GNU Lesser General Public License (LGPL)
# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
+# - JAWS License
# - MIT License
# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Mar 15 13:34:33 CET 2012
+#Fri Jul 20 09:15:19 EEST 2012
edu.smu.tspell--jaws--1.2=JAWS License
-javax.servlet--servlet-api--2.4=Common Development And Distribution License
(CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License
(CDDL), Version 1.0
org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/license/THIRD-PARTY.properties?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/license/THIRD-PARTY.properties
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/license/THIRD-PARTY.properties
Fri Jul 20 06:32:50 2012
@@ -1,30 +1,33 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - Apache License
-# - Apache Software License, Version 1.1
-# - BSD
-# - BSD-style license
-# - CDDL 1.1
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
-# - GPL2 w/ CPE
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - BSD-style
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:03:04 CET 2012
+#Fri Jul 20 09:15:09 EEST 2012
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License,
Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=Common Development And Distribution License
(CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License
(CDDL), Version 1.0
org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/license/THIRD-PARTY.properties?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/license/THIRD-PARTY.properties
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/license/THIRD-PARTY.properties
Fri Jul 20 06:32:50 2012
@@ -1,20 +1,26 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - Apache License
-# - BSD
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Feb 16 11:44:08 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License
(CDDL), Version 1.0
+#Thu Jul 19 17:29:09 EEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License
(CDDL), Version 1.0
org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/EndpointType.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/EndpointType.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/EndpointType.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/EndpointType.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.servicesapi.index;
/**
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexException.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexException.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexException.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexException.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.servicesapi.index;
import org.apache.stanbol.contenthub.servicesapi.exception.ContenthubException;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexState.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexState.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexState.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/IndexState.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.servicesapi.index;
/**
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/SemanticIndex.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/SemanticIndex.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/SemanticIndex.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/index/SemanticIndex.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.servicesapi.index;
import java.util.List;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/store/ChangeSet.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/store/ChangeSet.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/store/ChangeSet.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/store/ChangeSet.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.servicesapi.store;
import java.util.Set;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/file/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/file/src/license/THIRD-PARTY.properties?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/file/src/license/THIRD-PARTY.properties
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/file/src/license/THIRD-PARTY.properties
Fri Jul 20 06:32:50 2012
@@ -1,20 +1,27 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - Apache License
-# - BSD
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:03:01 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License
(CDDL), Version 1.0
+#Thu Jul 19 18:21:53 EEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License
(CDDL), Version 1.0
org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
+org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Added:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/license/THIRD-PARTY.properties?rev=1363664&view=auto
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/license/THIRD-PARTY.properties
(added)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/license/THIRD-PARTY.properties
Fri Jul 20 06:32:50 2012
@@ -0,0 +1,36 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - BSD-style
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
+# - ICU License
+# - MIT License
+# - Public Domain License
+# - Similar to Apache License but with the acknowledgment clause removed
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Fri Jul 20 09:21:06 EEST 2012
+antlr--antlr--2.7.2=Public Domain
+asm--asm--3.1=BSD License
+commons-beanutils--commons-beanutils--1.7.0=The Apache Software License,
Version 2.0
+dom4j--dom4j--1.1=BSD-style
+jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
+javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License
(CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
+org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
+org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
+org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
+oro--oro--2.0.8=The Apache Software License, Version 2.0
+xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/index/ldpath/LDPathSemanticIndexTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/index/ldpath/LDPathSemanticIndexTest.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/index/ldpath/LDPathSemanticIndexTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/index/ldpath/LDPathSemanticIndexTest.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.test.index.ldpath;
import static org.junit.Assert.assertNotNull;
@@ -70,7 +86,7 @@ public class LDPathSemanticIndexTest {
SemanticIndex tempSemanticIndex =
semanticIndexManager.getIndex(name);
int timeoutCount = 0;
while (tempSemanticIndex == null) {
- if(timeoutCount == 8) break;
+ if (timeoutCount == 8) break;
Thread.sleep(500);
tempSemanticIndex = semanticIndexManager.getIndex(name);
timeoutCount++;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartDeserializerTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartDeserializerTest.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartDeserializerTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartDeserializerTest.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.test.store.file;
import static org.junit.Assert.assertEquals;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartSerializerTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartSerializerTest.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartSerializerTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/ContentPartSerializerTest.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.test.store.file;
import static org.junit.Assert.assertEquals;
@@ -29,55 +45,52 @@ import org.slf4j.LoggerFactory;
@RunWith(SlingAnnotationsTestRunner.class)
public class ContentPartSerializerTest {
- private static final Logger log = LoggerFactory
- .getLogger(FileStoreDBManagerTest.class);
+ private static final Logger log =
LoggerFactory.getLogger(FileStoreDBManagerTest.class);
- @TestReference
- ContentPartSerializer contentPartSerializer;
+ @TestReference
+ ContentPartSerializer contentPartSerializer;
- @TestReference
- ContentItemFactory contentItemFactory;
+ @TestReference
+ ContentItemFactory contentItemFactory;
- @TestReference
- private Parser parser;
-
- @Test
- public void testBlobSerializerProvider() throws StoreException {
- String strExpected = "I live in Paris.";
- Blob blob = null;
- try {
- blob = contentItemFactory.createBlob(new
StringSource(strExpected));
- } catch (IOException e) {
- log.error("Blob cannot be created.");
- }
-
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- contentPartSerializer.serializeContentPart(os, blob);
-
- String strActual = new String(os.toByteArray());
- assertEquals(strExpected, strActual);
- }
-
- @Test
- public void testTripleCollectionSerializerProvider() throws
StoreException {
- TripleCollection tcExpected = new SimpleMGraph();
- tcExpected.add(new TripleImpl(new UriRef(
- "http://dbpedia.org/resource/Paris";), new
UriRef(
- "http://dbpedia.org/ontology/label";), new
UriRef(
-
"http://www.w3.org/2000/01/rdf-schema#label/Paris";)));
- tcExpected.add(new TripleImpl(new UriRef(
- "http://dbpedia.org/resource/Paris";), new
UriRef(
- "http://dbpedia.org/ontology/populationTotal";),
new UriRef(
-
"http://www.w3.org/2001/XMLSchema#long/2193031";)));
-
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- contentPartSerializer.serializeContentPart(os, tcExpected);
-
- InputStream is = new ByteArrayInputStream(os.toByteArray());
- MGraph tcActual = new SimpleMGraph();
- parser.parse(tcActual, is, SupportedFormat.RDF_XML);
-
- assertTrue(tcExpected.containsAll(tcActual));
- assertTrue(tcActual.containsAll(tcExpected));
- }
+ @TestReference
+ private Parser parser;
+
+ @Test
+ public void testBlobSerializerProvider() throws StoreException {
+ String strExpected = "I live in Paris.";
+ Blob blob = null;
+ try {
+ blob = contentItemFactory.createBlob(new
StringSource(strExpected));
+ } catch (IOException e) {
+ log.error("Blob cannot be created.");
+ }
+
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ contentPartSerializer.serializeContentPart(os, blob);
+
+ String strActual = new String(os.toByteArray());
+ assertEquals(strExpected, strActual);
+ }
+
+ @Test
+ public void testTripleCollectionSerializerProvider() throws StoreException
{
+ TripleCollection tcExpected = new SimpleMGraph();
+ tcExpected.add(new TripleImpl(new
UriRef("http://dbpedia.org/resource/Paris";), new UriRef(
+ "http://dbpedia.org/ontology/label";), new UriRef(
+ "http://www.w3.org/2000/01/rdf-schema#label/Paris";)));
+ tcExpected.add(new TripleImpl(new
UriRef("http://dbpedia.org/resource/Paris";), new UriRef(
+ "http://dbpedia.org/ontology/populationTotal";), new UriRef(
+ "http://www.w3.org/2001/XMLSchema#long/2193031";)));
+
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ contentPartSerializer.serializeContentPart(os, tcExpected);
+
+ InputStream is = new ByteArrayInputStream(os.toByteArray());
+ MGraph tcActual = new SimpleMGraph();
+ parser.parse(tcActual, is, SupportedFormat.RDF_XML);
+
+ assertTrue(tcExpected.containsAll(tcActual));
+ assertTrue(tcActual.containsAll(tcExpected));
+ }
}
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/FileStoreTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/FileStoreTest.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/FileStoreTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/test/src/main/java/org/apache/stanbol/contenthub/test/store/file/FileStoreTest.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.test.store.file;
import static org.junit.Assert.assertNotNull;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/license/THIRD-PARTY.properties?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/license/THIRD-PARTY.properties
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/license/THIRD-PARTY.properties
Fri Jul 20 06:32:50 2012
@@ -8,12 +8,12 @@
# - Common Development And Distribution License (CDDL), Version 1.0
# - Common Development And Distribution License (CDDL), Version 1.1
# - Common Public License, Version 1.0
+# - Dual license consisting of the CDDL v1.1 and GPL v2
# - Eclipse Public License, Version 1.0
# - GNU General Public License (GPL), Version 2 with classpath exception
# - GNU Lesser General Public License (LGPL)
# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
-# - Java HTML Tidy License
# - MIT License
# - Public Domain License
# - Similar to Apache License but with the acknowledgment clause removed
@@ -21,14 +21,14 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Mar 05 16:59:08 CET 2012
+#Fri Jul 20 09:15:26 EEST 2012
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License,
Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=Common Development And Distribution License
(CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License
(CDDL), Version 1.0
org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
Fri Jul 20 06:32:50 2012
@@ -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.contenthub.web.resources;
import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
@@ -113,52 +129,60 @@ public class SemanticIndexManagerResourc
//
// HTML view
//
-
+
public class IndexView {
private String name;
private String description;
private String state;
private long revision;
private Map<String,String> endpoints;
-
- public IndexView(String name,String description, String state,long
revision, Map<String,String> endpoints){
+
+ public IndexView(String name,
+ String description,
+ String state,
+ long revision,
+ Map<String,String> endpoints) {
this.name = name;
this.description = description;
this.state = state;
this.revision = revision;
this.endpoints = endpoints;
}
-
- public String getName(){
+
+ public String getName() {
return name;
}
- public String getDescription(){
+
+ public String getDescription() {
return description;
}
- public String getState(){
+
+ public String getState() {
return state;
}
- public long getRevision(){
+
+ public long getRevision() {
return revision;
}
- public Map<String,String> getEndpoints(){
+
+ public Map<String,String> getEndpoints() {
return endpoints;
}
}
-
+
public List<IndexView> getSemanticIndexes() throws
IndexManagementException {
List<IndexView> indexView = new ArrayList<IndexView>();
List<SemanticIndex> indexes = semanticIndexManager.getIndexes(null,
null);
- for(SemanticIndex index : indexes){
+ for (SemanticIndex index : indexes) {
Map<EndpointType,String> restEndpoints =
index.getRESTSearchEndpoints();
Map<String,String> endpoints = new HashMap<String,String>();
- for(Entry<EndpointType,String> restEndpoint :
restEndpoints.entrySet()){
+ for (Entry<EndpointType,String> restEndpoint :
restEndpoints.entrySet()) {
endpoints.put(restEndpoint.getKey().name(),
restEndpoint.getValue());
}
- indexView.add(new IndexView(index.getName(),
index.getDescription(), index.getState().name(),
index.getRevision(),endpoints));
+ indexView.add(new IndexView(index.getName(),
index.getDescription(), index.getState().name(),
+ index.getRevision(), endpoints));
}
return indexView;
}
-
}
Copied:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/doc/storeRestApi.ftl
(from r1363343,
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/storeRestApi.ftl)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/doc/storeRestApi.ftl?p2=incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/doc/storeRestApi.ftl&p1=incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/storeRestApi.ftl&r1=1363343&r2=1363664&rev=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/storeRestApi.ftl
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/imports/doc/storeRestApi.ftl
Fri Jul 20 06:32:50 2012
@@ -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.
+-->
<#--
<h3>Uploading new content to the Contenthub</h3>
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl?rev=1363664&r1=1363663&r2=1363664&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl
Fri Jul 20 06:32:50 2012
@@ -111,7 +111,7 @@
</div>
<div class="panel" id="restapi" style="display: none;">
- <#include "/imports/storeRestApi.ftl">
+ <#include "/imports/doc/storeRestApi.ftl">
</div>
<script language="javascript">
