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/12/06 09:05:09 UTC
[1/2] git commit: MARMOTTA-392: trying to file a proper solution on
all operative systems
Updated Branches:
refs/heads/develop f6db7d9cc -> fe53dfb82
MARMOTTA-392: trying to file a proper solution on all operative systems
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2f59b41f
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2f59b41f
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2f59b41f
Branch: refs/heads/develop
Commit: 2f59b41f63096185e0319bce7efdedb3c3530331
Parents: f6db7d9
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Dec 6 08:57:50 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Dec 6 08:57:50 2013 +0100
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
launchers/marmotta-webapp-bigdata/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
parent/pom.xml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2f59b41f/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
index d96f5f8..941ed2d 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
@@ -27,7 +27,7 @@
<version>${version}</version>
<properties>
- <marmotta.home>${java.io.tmpdir}marmotta</marmotta.home>
+ <marmotta.home>${java.io.tmpdir}${file.separator}marmotta</marmotta.home>
<marmotta.context>/</marmotta.context>
<marmotta.port>8080</marmotta.port>
</properties>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2f59b41f/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index acdb042..5172827 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -66,7 +66,7 @@
<configuration>
<filesets>
<fileset>
- <directory>${java.io.tmpdir}marmotta-test</directory>
+ <directory>${java.io.tmpdir}${file.separator}marmotta-test</directory>
<followSymlinks>true</followSymlinks>
</fileset>
</filesets>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2f59b41f/launchers/marmotta-webapp-bigdata/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/pom.xml b/launchers/marmotta-webapp-bigdata/pom.xml
index ed43888..656af87 100644
--- a/launchers/marmotta-webapp-bigdata/pom.xml
+++ b/launchers/marmotta-webapp-bigdata/pom.xml
@@ -36,7 +36,7 @@
<properties>
<!-- these are used for the goals tomcat6/7:run or jetty:run -->
- <marmotta.home>${java.io.tmpdir}marmotta</marmotta.home>
+ <marmotta.home>${java.io.tmpdir}${file.separator}marmotta</marmotta.home>
<marmotta.context>/</marmotta.context>
<marmotta.port>8080</marmotta.port>
</properties>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2f59b41f/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 614343a..0d79cb4 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -34,7 +34,7 @@
<properties>
<!-- these are used for the goals tomcat6/7:run or jetty:run -->
- <marmotta.home>${java.io.tmpdir}marmotta</marmotta.home>
+ <marmotta.home>${java.io.tmpdir}${file.separator}marmotta</marmotta.home>
<marmotta.context>/</marmotta.context>
<marmotta.port>8080</marmotta.port>
</properties>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2f59b41f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1f5500d..9d8242e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1599,12 +1599,12 @@
<repository>
<id>apache.releases</id>
<name>Apache Relesases Repository</name>
- <url>file://${java.io.tmpdir}repo</url>
+ <url>file://${java.io.tmpdir}${file.separator}repo</url>
</repository>
<snapshotRepository>
<id>apache.snapshots</id>
<name>Apache Snapshots Repository</name>
- <url>file://${java.io.tmpdir}repo</url>
+ <url>file://${java.io.tmpdir}${file.separator}repo</url>
</snapshotRepository>
</distributionManagement>
[2/2] git commit: MARMOTTA-248: applied the patch from Oliver Janner
Posted by wi...@apache.org.
MARMOTTA-248: applied the patch from Oliver Janner
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/fe53dfb8
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/fe53dfb8
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/fe53dfb8
Branch: refs/heads/develop
Commit: fe53dfb82077acc6045cab96b7e8e3af61d6ddf4
Parents: 2f59b41
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Dec 6 09:03:18 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Dec 6 09:03:18 2013 +0100
----------------------------------------------------------------------
.../platform/core/webservices/prefix/PrefixWebService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/fe53dfb8/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java
index 740d53d..1ecf363 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/prefix/PrefixWebService.java
@@ -54,7 +54,7 @@ public class PrefixWebService {
@Inject
private PrefixService prefixService;
- private static final String PREFIX_PATTERN = "{prefix: [a-z][a-zA-Z0-9]+}";
+ private static final String PREFIX_PATTERN = "{prefix: [a-z][a-zA-Z0-9\\._-]+}";
/**
* Get all prefixes mappings