You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/02/28 09:47:17 UTC
git commit: more renaming
Updated Branches:
refs/heads/master fa53eb5dd -> adc92aa5d
more renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/adc92aa5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/adc92aa5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/adc92aa5
Branch: refs/heads/master
Commit: adc92aa5dfb949b29b03159a4da400245355848f
Parents: fa53eb5
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 28 09:46:38 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 28 09:46:38 2013 +0100
----------------------------------------------------------------------
platform/marmotta-core/pom.xml | 6 +-
.../src/main/resources/META-INF/ehcache.xml | 6 ++-
.../platform/core/test/base/EmbeddedMarmotta.java | 4 +-
.../platform/core/test/base/JettyMarmotta.java | 19 +++----
.../core/test/embedded/EmbeddedLMFTest.java | 42 ---------------
.../core/test/embedded/EmbeddedMarmottaTest.java | 40 ++++++++++++++
6 files changed, 58 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/adc92aa5/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index 808fbe8..aa20278 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -30,11 +30,11 @@
<name>Apache Marmotta Platform: Core</name>
<description>
- Core functionalities of the Linked Media Framework: Persistence, Transaction Management, Triple Store,
- Framework Setup.
+ Core functionalities of the Linked Media Framework: Persistence,
+ Transaction Management, Triple Store, Framework Setup.
</description>
- <!-- build a test jar for lmf-core so other modules can use the EmbeddedLMF configuration -->
+ <!-- build a test jar for lmf-core so other modules can use the EmbeddedMarmotta configuration -->
<!-- usage:
<dependency>
<groupId>org.apache.marmotta</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/adc92aa5/platform/marmotta-core/src/main/resources/META-INF/ehcache.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/META-INF/ehcache.xml b/platform/marmotta-core/src/main/resources/META-INF/ehcache.xml
index ed3f089..f51210a 100644
--- a/platform/marmotta-core/src/main/resources/META-INF/ehcache.xml
+++ b/platform/marmotta-core/src/main/resources/META-INF/ehcache.xml
@@ -74,7 +74,7 @@ are "on" and "off". The default is "autodetect".
Subdirectories can be specified below the property e.g. java.io.tmpdir/one
-->
- <diskStore path="java.io.tmpdir/lmf-cache"/>
+ <diskStore path="java.io.tmpdir/marmotta-cache"/>
<!--
Cachemanagereventlistener
@@ -408,6 +408,7 @@ are "on" and "off". The default is "autodetect".
overflowToDisk="false"
memoryStoreEvictionPolicy="LRU"/>
+ <!--
<cache name="org.hibernate.cache.StandardQueryCache"
statistics="true"
maxElementsInMemory="10000"
@@ -420,6 +421,7 @@ are "on" and "off". The default is "autodetect".
maxElementsInMemory="10000"
eternal="true"
overflowToDisk="false"/>
+ -->
<!-- the cache used for triple queries by KiWi -->
<!-- the cache used for triple queries by KiWi -->
@@ -495,4 +497,4 @@ are "on" and "off". The default is "autodetect".
properties="monitorAddress=localhost, monitorPort=9889" />
-->
-</ehcache>
\ No newline at end of file
+</ehcache>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/adc92aa5/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java
index 04bfd2f..0007298 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/EmbeddedMarmotta.java
@@ -34,12 +34,12 @@ public class EmbeddedMarmotta extends AbstractMarmotta {
super();
// initiate the first startup phase without a servlet context and with the override definition of the parent
- startupService.startupConfiguration(home.getAbsolutePath(), override,null);
+ startupService.startupConfiguration(home.getAbsolutePath(), override, null);
// initiate the second startup phase and pretend we are running at localhost
startupService.startupHost("http://localhost/","http://localhost/");
- log.info("EmbeddedLMF created");
+ log.info(EmbeddedMarmotta.class.getName() + " created");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/adc92aa5/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
index cf39ebb..8e5ded1 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java
@@ -17,6 +17,11 @@
*/
package org.apache.marmotta.platform.core.test.base;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.marmotta.platform.core.servlet.MarmottaResourceFilter;
import org.apache.marmotta.platform.core.test.base.jetty.TestApplication;
import org.apache.marmotta.platform.core.test.base.jetty.TestInjectorFactory;
@@ -30,18 +35,13 @@ import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.FilterHolder;
import org.mortbay.jetty.servlet.ServletHolder;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* An extended version of the EmbeddedLMF which also starts a jetty webcontainer. The context name and port
- * are passed in the constructor. The JettyLMF can optionally take a set of web service classes as argument.
+ * are passed in the constructor. The JettyMarmotta can optionally take a set of web service classes as argument.
* If this argument is present, only the given web services will be instantiated; otherwise, all configured
- * web services will be instantiated (as in a normal LMF webapp installation).
- * <p/>
- * Author: Sebastian Schaffert
+ * web services will be instantiated (as in a normal webapp installation).
+ *
+ * @author Sebastian Schaffert
*/
public class JettyMarmotta extends AbstractMarmotta {
@@ -59,7 +59,6 @@ public class JettyMarmotta extends AbstractMarmotta {
this(context,port, new HashSet<Class<?>>(Arrays.asList(webservices)));
}
-
public JettyMarmotta(String context, int port, Set<Class<?>> webservice) {
super();
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/adc92aa5/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/embedded/EmbeddedLMFTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/embedded/EmbeddedLMFTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/embedded/EmbeddedLMFTest.java
deleted file mode 100644
index 51fb432..0000000
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/embedded/EmbeddedLMFTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 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.marmotta.platform.core.test.embedded;
-
-import org.apache.marmotta.platform.core.api.config.ConfigurationService;
-import org.apache.marmotta.platform.core.test.base.EmbeddedMarmotta;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Add file description here!
- * <p/>
- * Author: Sebastian Schaffert
- */
-public class EmbeddedLMFTest {
-
- @Test
- public void testLMFStartup() {
- EmbeddedMarmotta lmf = new EmbeddedMarmotta();
-
- ConfigurationService cs = lmf.getService(ConfigurationService.class);
-
- Assert.assertNotNull(cs);
-
- lmf.shutdown();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/adc92aa5/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/embedded/EmbeddedMarmottaTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/embedded/EmbeddedMarmottaTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/embedded/EmbeddedMarmottaTest.java
new file mode 100644
index 0000000..d8c893e
--- /dev/null
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/embedded/EmbeddedMarmottaTest.java
@@ -0,0 +1,40 @@
+/**
+ * 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.marmotta.platform.core.test.embedded;
+
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.test.base.EmbeddedMarmotta;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Embedded Marmotta Test
+ *
+ * @author Sebastian Schaffert
+ */
+public class EmbeddedMarmottaTest {
+
+ @Test
+ public void testMarmottaStartup() {
+ EmbeddedMarmotta marmotta = new EmbeddedMarmotta();
+ ConfigurationService cs = marmotta.getService(ConfigurationService.class);
+ Assert.assertNotNull(cs);
+ marmotta.shutdown();
+ }
+
+}