oltu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1465919 - in /oltu/trunk: demos/ demos/client-demo/ demos/client-demo/pom.xml demos/pom.xml oauth-2.0/client-demo/ oauth-2.0/pom.xml pom.xml
Date Tue, 09 Apr 2013 07:55:24 GMT
Author: simonetripodi
Date: Tue Apr  9 07:55:23 2013
New Revision: 1465919

URL: http://svn.apache.org/r1465919
Log:
[OLTU-97] #comment demos moved in a separated module #resolve

Added:
    oltu/trunk/demos/
    oltu/trunk/demos/client-demo/
      - copied from r1465916, oltu/trunk/oauth-2.0/client-demo/
    oltu/trunk/demos/pom.xml   (with props)
Removed:
    oltu/trunk/oauth-2.0/client-demo/
Modified:
    oltu/trunk/demos/client-demo/pom.xml
    oltu/trunk/oauth-2.0/pom.xml
    oltu/trunk/pom.xml

Modified: oltu/trunk/demos/client-demo/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/demos/client-demo/pom.xml?rev=1465919&r1=1465916&r2=1465919&view=diff
==============================================================================
--- oltu/trunk/demos/client-demo/pom.xml (original)
+++ oltu/trunk/demos/client-demo/pom.xml Tue Apr  9 07:55:23 2013
@@ -19,15 +19,22 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.oltu.oauth2</groupId>
-    <artifactId>org.apache.oltu.oauth2.parent</artifactId>
-    <version>0.31-SNAPSHOT</version>
+    <groupId>org.apache.oltu.demos</groupId>
+    <artifactId>org.apache.oltu.demos.parent</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.apache.oltu.oauth2.client-demo</artifactId>
+  <artifactId>org.apache.oltu.demos.client</artifactId>
   <packaging>war</packaging>
 
-  <name>Apache Oltu - OAuth 2.0 - Demo Application</name>
+  <name>Apache Oltu - Demos - Client</name>
+
+  <properties>
+    <oltu.oauth2.version>0.31-SNAPSHOT</oltu.oauth2.version>
+    <oltu.oidc.version>0.1-SNAPSHOT</oltu.oidc.version>
+    <org.springframework.version>3.0.3.RELEASE</org.springframework.version>
+    <servlet-api.version>2.5</servlet-api.version>
+  </properties>
 
   <dependencies>
     <dependency>
@@ -40,26 +47,26 @@
     <dependency>
       <artifactId>org.apache.oltu.oauth2.common</artifactId>
       <groupId>org.apache.oltu.oauth2</groupId>
-      <version>${project.version}</version>
+      <version>${oltu.oauth2.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
-      <version>${project.version}</version>
+      <version>${oltu.oauth2.version}</version>
     </dependency>
 
     <!-- OpenId Connect Dependency -->
     <dependency>
       <groupId>org.apache.oltu.openidconnect</groupId>
       <artifactId>org.apache.oltu.openidconnect.common</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>${oltu.oidc.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.oltu.openidconnect</groupId>
       <artifactId>org.apache.oltu.openidconnect.client</artifactId>
-      <version>0.1-SNAPSHOT</version>
+      <version>${oltu.oidc.version}</version>
     </dependency>
 
     <!-- OAuth Dynamic Registration Dependency -->
@@ -67,13 +74,13 @@
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.dynamicreg.client</artifactId>
-      <version>${project.version}</version>
+      <version>${oltu.oauth2.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.dynamicreg.common</artifactId>
-      <version>${project.version}</version>
+      <version>${oltu.oauth2.version}</version>
     </dependency>
 
     <!-- Spring MVC -->
@@ -106,6 +113,13 @@
       <scope>runtime</scope>
     </dependency>
 
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!--
      | Make use of JSP tags. Remove, if you don't use JSPs
     -->

Added: oltu/trunk/demos/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/demos/pom.xml?rev=1465919&view=auto
==============================================================================
--- oltu/trunk/demos/pom.xml (added)
+++ oltu/trunk/demos/pom.xml Tue Apr  9 07:55:23 2013
@@ -0,0 +1,39 @@
+<?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.
+-->
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.oltu</groupId>
+    <artifactId>org.apache.oltu.parent</artifactId>
+    <version>1-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
+  </parent>
+
+  <groupId>org.apache.oltu.demos</groupId>
+  <artifactId>org.apache.oltu.demos.parent</artifactId>
+  <version>1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>Apache Oltu - Demos - Parent</name>
+
+  <modules>
+    <module>client-demo</module>
+  </modules>
+
+</project>

Propchange: oltu/trunk/demos/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: oltu/trunk/demos/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: oltu/trunk/demos/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: oltu/trunk/oauth-2.0/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/oauth-2.0/pom.xml?rev=1465919&r1=1465918&r2=1465919&view=diff
==============================================================================
--- oltu/trunk/oauth-2.0/pom.xml (original)
+++ oltu/trunk/oauth-2.0/pom.xml Tue Apr  9 07:55:23 2013
@@ -43,7 +43,6 @@
     <module>resourceserver-filter</module>
     <module>dynamicreg-server</module>
     <module>test-utils</module>
-    <module>client-demo</module>
     <module>integration-tests</module>
      <module>jwt</module>
   </modules>

Modified: oltu/trunk/pom.xml
URL: http://svn.apache.org/viewvc/oltu/trunk/pom.xml?rev=1465919&r1=1465918&r2=1465919&view=diff
==============================================================================
--- oltu/trunk/pom.xml (original)
+++ oltu/trunk/pom.xml Tue Apr  9 07:55:23 2013
@@ -35,6 +35,7 @@
     <module>parent</module>
     <module>oauth-2.0</module>
     <module>openid-connect</module>
+    <module>demos</module>
   </modules>
 
   <build>



Mime
View raw message