marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject [1/12] git commit: MARMOTTA-108: marmotta-client-js-webapp
Date Wed, 27 Feb 2013 13:01:11 GMT
MARMOTTA-108: marmotta-client-js-webapp


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/262c2575
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/262c2575
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/262c2575

Branch: refs/heads/master
Commit: 262c25753687b3ab6581b1618bb980d81b394bae
Parents: b2c6305
Author: Jakob Frank <jakob@apache.org>
Authored: Wed Feb 27 12:32:55 2013 +0100
Committer: Jakob Frank <jakob@apache.org>
Committed: Wed Feb 27 13:50:47 2013 +0100

----------------------------------------------------------------------
 client/lmf-client-js-sample-webapp/pom.xml         |   50 --------------
 .../src/main/webapp/WEB-INF/web.xml                |   25 -------
 .../src/main/webapp/index.html                     |   32 ---------
 client/marmotta-client-js-sample-webapp/pom.xml    |   51 +++++++++++++++
 .../src/main/webapp/WEB-INF/web.xml                |   25 +++++++
 .../src/main/webapp/index.html                     |   32 +++++++++
 client/pom.xml                                     |    2 +-
 7 files changed, 109 insertions(+), 108 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/262c2575/client/lmf-client-js-sample-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/client/lmf-client-js-sample-webapp/pom.xml b/client/lmf-client-js-sample-webapp/pom.xml
deleted file mode 100644
index a6e74b8..0000000
--- a/client/lmf-client-js-sample-webapp/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2013 Salzburg Research.
-  ~
-  ~  Licensed 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">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.marmotta</groupId>
-        <artifactId>marmotta-client</artifactId>
-        <version>3.0.0-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>lmf-client-js-sample-webapp</artifactId>
-    <packaging>war</packaging>
-
-    <name>LMF Client Library JavaScript Sample Webapp</name>
-    <description>A sample Web application for the LMF JavaScript Client Library</description>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.marmotta</groupId>
-            <artifactId>lmf-client-js</artifactId>
-            <version>2.6.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.webjars</groupId>
-            <artifactId>jquery</artifactId>
-            <version>1.8.2</version>
-        </dependency>
-    </dependencies>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/262c2575/client/lmf-client-js-sample-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/client/lmf-client-js-sample-webapp/src/main/webapp/WEB-INF/web.xml b/client/lmf-client-js-sample-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index ba9023c..0000000
--- a/client/lmf-client-js-sample-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2013 The Apache Software Foundation.
-
-    Licensed 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.
-
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-     version="2.5">
-
-</web-app>
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/262c2575/client/lmf-client-js-sample-webapp/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/client/lmf-client-js-sample-webapp/src/main/webapp/index.html b/client/lmf-client-js-sample-webapp/src/main/webapp/index.html
deleted file mode 100644
index 830c33b..0000000
--- a/client/lmf-client-js-sample-webapp/src/main/webapp/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-
-    Copyright (C) 2013 The Apache Software Foundation.
-
-    Licensed 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.
-
--->
-<!DOCTYPE html>
-<html>
-
-  <head>
-    <title>LMF Javascript Webapp Sample</title>
-    <script type="text/javascript" src="/webjars/jquery/1.8.2/jquery.min.js"></script>
-    <script type="text/javascript" src="/webjars/lmf-client-js/2.3.5-SNAPSHOT/lmf.js"></script>
-  </head>
-
-  <body>
-    <h1>Hello LMF.js!</h1>
-  </body>
-
-</html>
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/262c2575/client/marmotta-client-js-sample-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js-sample-webapp/pom.xml b/client/marmotta-client-js-sample-webapp/pom.xml
new file mode 100644
index 0000000..9fe2d96
--- /dev/null
+++ b/client/marmotta-client-js-sample-webapp/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Copyright (c) 2013 Salzburg Research. ~ ~ Licensed 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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.marmotta</groupId>
+        <artifactId>marmotta-parent</artifactId>
+        <version>3.0.0-incubating-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>marmotta-client-js-sample-webapp</artifactId>
+    <packaging>war</packaging>
+
+    <name>Marmotta Client Library JavaScript Sample Webapp</name>
+    <description>A sample Web application for the Marmotta JavaScript Client Library</description>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/webapp</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.marmotta</groupId>
+            <artifactId>marmotta-client-js</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
+

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/262c2575/client/marmotta-client-js-sample-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js-sample-webapp/src/main/webapp/WEB-INF/web.xml b/client/marmotta-client-js-sample-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..54dab89
--- /dev/null
+++ b/client/marmotta-client-js-sample-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2013 The Apache Software Foundation.
+
+    Licensed 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.
+
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+     version="2.5">
+
+</web-app>
+

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/262c2575/client/marmotta-client-js-sample-webapp/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js-sample-webapp/src/main/webapp/index.html b/client/marmotta-client-js-sample-webapp/src/main/webapp/index.html
new file mode 100644
index 0000000..7c603a3
--- /dev/null
+++ b/client/marmotta-client-js-sample-webapp/src/main/webapp/index.html
@@ -0,0 +1,32 @@
+<!--
+
+    Copyright (C) 2013 The Apache Software Foundation.
+
+    Licensed 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.
+
+-->
+<!DOCTYPE html>
+<html>
+
+  <head>
+    <title>Marmotta Javascript Webapp Sample</title>
+    <script type="text/javascript" src="/webjars/jquery/1.8.2/jquery.min.js"></script>
+    <script type="text/javascript" src="/webjars/marmotta-client-js/${project.version}/lmf.js"></script>
+  </head>
+
+  <body>
+    <h1>Hello Marmotta.js!</h1>
+  </body>
+
+</html>
+

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/262c2575/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index c1ee8cd..9a3fdc2 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -41,7 +41,7 @@
             <modules>
                 <module>lmf-client-php</module>
                 <module>marmotta-client-js</module>
-                <module>lmf-client-js-sample-webapp</module>          
+                <module>marmotta-client-js-sample-webapp</module>          
             </modules>
         </profile>
     </profiles>


Mime
View raw message