* Moved module 'oauth' -> 'client-auth'

* renamed maven modules to matsim-viz.*
matsim-org · Oct 12, 2018 · b168303 · b168303
1 parent 03c2878
commit b168303
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 19 deletions.
diff --git a/auth/pom.xml b/auth/pom.xml
@@ -6,12 +6,11 @@
 
     <parent>
         <groupId>org.matsim</groupId>
-        <artifactId>matsim-webvis</artifactId>
+        <artifactId>matsim-viz</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>auth</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/auth/src/main/java/org/matsim/viz/auth/entities/DAO.java b/auth/src/main/java/org/matsim/viz/auth/entities/DAO.java
@@ -4,6 +4,6 @@
 
 public abstract class DAO {
 
-    protected static PersistenceUnit database = new PersistenceUnit("org.matsim.matsim-webvis.auth");
+    protected static PersistenceUnit database = new PersistenceUnit("org.matsim.viz.auth");
 
 }
diff --git a/auth/src/main/resources/META-INF/persistence.xml b/auth/src/main/resources/META-INF/persistence.xml
@@ -3,9 +3,9 @@
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
              version="2.0">
 
-    <persistence-unit name="org.matsim.matsim-webvis.auth">
+    <persistence-unit name="org.matsim.viz.auth">
         <description>
-            Persistence Unit for the authorization server of matsim-webvis
+            Persistence Unit for the authorization server of matsim-viz-auth
         </description>
         <properties>
             <!-- Using a H2 in memory Database for now -->

diff --git a/oauth/pom.xml → client-auth/pom.xml b/oauth/pom.xml → client-auth/pom.xml
@@ -3,13 +3,13 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>matsim-webvis</artifactId>
+        <artifactId>matsim-viz</artifactId>
         <groupId>org.matsim</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>oauth</artifactId>
+    <artifactId>client-auth</artifactId>
 
     <dependencies>
         <dependency>

diff --git a/...m/viz/clientAuth/AccessTokenResponse.java → ...m/viz/clientAuth/AccessTokenResponse.java b/...m/viz/clientAuth/AccessTokenResponse.java → ...m/viz/clientAuth/AccessTokenResponse.java
diff --git a/.../viz/clientAuth/ClientAuthentication.java → .../viz/clientAuth/ClientAuthentication.java b/.../viz/clientAuth/ClientAuthentication.java → .../viz/clientAuth/ClientAuthentication.java
diff --git a/...rg/matsim/viz/clientAuth/Credentials.java → ...rg/matsim/viz/clientAuth/Credentials.java b/...rg/matsim/viz/clientAuth/Credentials.java → ...rg/matsim/viz/clientAuth/Credentials.java
diff --git a/...m/viz/clientAuth/IntrospectionResult.java → ...m/viz/clientAuth/IntrospectionResult.java b/...m/viz/clientAuth/IntrospectionResult.java → ...m/viz/clientAuth/IntrospectionResult.java
diff --git a/...m/viz/clientAuth/NoAuthAuthenticator.java → ...m/viz/clientAuth/NoAuthAuthenticator.java b/...m/viz/clientAuth/NoAuthAuthenticator.java → ...m/viz/clientAuth/NoAuthAuthenticator.java
diff --git a/...g/matsim/viz/clientAuth/NoAuthFilter.java → ...g/matsim/viz/clientAuth/NoAuthFilter.java b/...g/matsim/viz/clientAuth/NoAuthFilter.java → ...g/matsim/viz/clientAuth/NoAuthFilter.java
diff --git a/...im/viz/clientAuth/OAuthAuthenticator.java → ...im/viz/clientAuth/OAuthAuthenticator.java b/...im/viz/clientAuth/OAuthAuthenticator.java → ...im/viz/clientAuth/OAuthAuthenticator.java
diff --git a/database/pom.xml b/database/pom.xml
@@ -3,14 +3,13 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>matsim-webvis</artifactId>
+        <artifactId>matsim-viz</artifactId>
         <groupId>org.matsim</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>database</artifactId>
-    <packaging>jar</packaging>
 
 
     <build>

diff --git a/database/src/main/java/org/matsim/viz/database/AbstractEntity.java b/database/src/main/java/org/matsim/viz/database/AbstractEntity.java
@@ -16,7 +16,7 @@ public abstract class AbstractEntity {
 
     @Id
     @GeneratedValue(generator = "uuid")
-    @GenericGenerator(name = "uuid", strategy = "UUIDGenerator")
+    @GenericGenerator(name = "uuid", strategy = "org.matsim.viz.database.UUIDGenerator")
     private String id;
 
     @Override

diff --git a/error-handling/pom.xml b/error-handling/pom.xml
@@ -3,7 +3,7 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>matsim-webvis</artifactId>
+        <artifactId>matsim-viz</artifactId>
         <groupId>org.matsim</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

diff --git a/files/pom.xml b/files/pom.xml
@@ -6,18 +6,17 @@
 
     <parent>
         <groupId>org.matsim</groupId>
-        <artifactId>matsim-webvis</artifactId>
+        <artifactId>matsim-viz</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>files</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.matsim</groupId>
-            <artifactId>oauth</artifactId>
+            <artifactId>client-auth</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>

diff --git a/frame-animation/pom.xml b/frame-animation/pom.xml
@@ -6,12 +6,11 @@
 
     <parent>
         <groupId>org.matsim</groupId>
-        <artifactId>matsim-webvis</artifactId>
+        <artifactId>matsim-viz</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>frame-animation</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -23,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.matsim</groupId>
-            <artifactId>oauth</artifactId>
+            <artifactId>client-auth</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.matsim</groupId>
-    <artifactId>matsim-webvis</artifactId>
+    <artifactId>matsim-viz</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
@@ -14,11 +14,12 @@
         <module>files</module>
         <module>frame-animation</module>
         <module>error-handling</module>
-        <module>oauth</module>
+        <module>client-auth</module>
         <module>database</module>
     </modules>
 
     <properties>
+        <matsim-viz.verion>1.0-SNAPSHOT</matsim-viz.verion>
         <java.version>1.8</java.version>
         <junit.version>4.12</junit.version>
         <dropwizard.version>1.3.5</dropwizard.version>