Update the deployment process to produce different artifacts for the

different authentication types. This process is now driven by property files under the zanata-war module. The authentication type is once again tied to the deployed artifact and is not determined by a configuration entry in the database.
zanata · Sep 16, 2011 · ad24816 · ad24816
1 parent d68e046
commit ad24816
Show file tree

Hide file tree

Showing 25 changed files with 390 additions and 319 deletions.
diff --git a/server/zanata-dist/etc/assembly.xml b/server/zanata-dist/etc/assembly.xml
@@ -20,17 +20,27 @@
 	<dependencySets>
 		<dependencySet>
 			<includes>
-				<include>org.zanata:zanata-war:war</include>
+				<include>org.zanata:zanata-war:war:jaas</include>
 			</includes>
-			<outputDirectory>generic</outputDirectory>
-			<outputFileNameMapping>zanata.war</outputFileNameMapping>
+			<outputFileNameMapping>zanata${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
 		</dependencySet>
 		<dependencySet>
 			<includes>
 				<include>org.zanata:zanata-war:war:kerberos</include>
 			</includes>
-			<outputDirectory>kerberos</outputDirectory>
-			<outputFileNameMapping>zanata.war</outputFileNameMapping>
+			<outputFileNameMapping>zanata${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.zanata:zanata-war:war:fedora</include>
+			</includes>
+			<outputFileNameMapping>zanata${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>org.zanata:zanata-war:war:internal</include>
+			</includes>
+			<outputFileNameMapping>zanata${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
 		</dependencySet>
 	</dependencySets>
 </assembly>
diff --git a/server/zanata-dist/pom.xml b/server/zanata-dist/pom.xml
@@ -38,6 +38,7 @@
   		<groupId>org.zanata</groupId>
   		<artifactId>zanata-war</artifactId>
   		<type>war</type>
+  		<classifier>jaas</classifier>
   		<version>${project.version}</version>
   	</dependency>
   	<dependency>
@@ -47,6 +48,20 @@
   		<classifier>kerberos</classifier>
   		<version>${project.version}</version>
   	</dependency>
+  	<dependency>
+  		<groupId>org.zanata</groupId>
+  		<artifactId>zanata-war</artifactId>
+  		<type>war</type>
+  		<classifier>fedora</classifier>
+  		<version>${project.version}</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.zanata</groupId>
+  		<artifactId>zanata-war</artifactId>
+  		<type>war</type>
+  		<classifier>internal</classifier>
+  		<version>${project.version}</version>
+  	</dependency>
   </dependencies>
 
 </project>
diff --git a/server/zanata-model/pom.xml b/server/zanata-model/pom.xml
@@ -12,17 +12,6 @@
   <packaging>jar</packaging>
 
 	<properties>
-		<env.hibernate.hbm2ddl.auto />
-		<env.hibernate.show_sql>false</env.hibernate.show_sql>
-		<env.hibernate.format_sql>false</env.hibernate.format_sql>
-		<env.hibernate.indexBase>zanatasearchindex</env.hibernate.indexBase>
-
-		<ds.jndi.name>zanataTestDatasource</ds.jndi.name>
-		<ds.hibernate.dialect>org.hibernate.dialect.H2Dialect</ds.hibernate.dialect>
-		<ds.driver.class>org.h2.Driver</ds.driver.class>
-		<ds.connection.url>jdbc:h2:mem:zanata;DB_CLOSE_DELAY=-1</ds.connection.url> <!-- *-ds.xml -->
-		<ds.user.name>sa</ds.user.name> <!-- *-ds.xml -->
-		<ds.password /> <!-- *-ds.xml -->
 	</properties>
 
 	<build>

diff --git a/server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java b/server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
@@ -40,7 +40,6 @@ public class HApplicationConfiguration extends ModelEntityBase
    public static String KEY_HOME_CONTENT     = "flies.home.content";
    public static String KEY_HELP_CONTENT     = "flies.help.content";
    public static String KEY_LOGINCONFIG_URL  = "zanata.login-config.url";
-   public static String KEY_AUTHTYPE         = "zanata.security.authType";
 
    private String key;
    private String value;

diff --git a/server/zanata-model/src/test/resources/META-INF/persistence.xml b/server/zanata-model/src/test/resources/META-INF/persistence.xml
diff --git a/server/zanata-war/eclipse/launch/webtrans-dummy.launch b/server/zanata-war/eclipse/launch/webtrans-dummy.launch
@@ -22,7 +22,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-codeServerPort 9998 -war &quot;${project_loc:/zanata-war}/src/main/webapp&quot; -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -startupUrl webtrans/Application.html?project=sample-project&amp;iteration=1.0&amp;localeId=de -logLevel INFO -port 48881 org.zanata.webtrans.ApplicationDummy"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-codeServerPort 9998 -war &quot;${project_loc:/zanata-war}/src/main/webapp&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="zanata-war"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -Dgwt.nowarn.legacy.tools -Dgwt.nowarn.webapp.classpath"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:zanata-war}"/>

diff --git a/server/zanata-war/eclipse/launch/webtrans-jboss.launch b/server/zanata-war/eclipse/launch/webtrans-jboss.launch
@@ -23,7 +23,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-codeServerPort 9997 -war &quot;${deploy.zanata}&quot; -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -startupUrl http://localhost:8080/zanata/webtrans/Application.html?project=sample-project&amp;iteration=1.0&amp;localeId=de -logLevel INFO -noserver org.zanata.webtrans.Application"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-codeServerPort 9997 -war &quot;${deploy.zanata}&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="zanata-war"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:zanata-war}"/>

diff --git a/server/zanata-war/etc/scripts/zanata-deploy.sh b/server/zanata-war/etc/scripts/zanata-deploy.sh
@@ -45,7 +45,7 @@ ssh=${ssh-ssh}
 scp=${scp-scp}
 mail=${mail-mail}
 
-BUILD_TYPES=(auto internal kerberos fedora nukes)
+BUILD_TYPES=(autotest internal kerberos fedora jaas)
 
 # functions:
 
@@ -147,11 +147,7 @@ do
       fi
       set +x
 
-      if [[ $buildType == "kerberos" ]]; then
-         warfile=server/zanata-war/target/zanata-kerberos.war
-      else
-         warfile=server/zanata-war/target/zanata.war
-      fi
+      warfile=server/zanata-war/target/zanata-$buildType.war
 
       set -x
       echo copying $warfile to $host:$targetfile

diff --git a/...ar/src/main/resources-jboss/zanata-ds.xml → server/zanata-war/etc/zanata-ds.xml b/...ar/src/main/resources-jboss/zanata-ds.xml → server/zanata-war/etc/zanata-ds.xml
diff --git a/...c/main/resources-jboss/zanata-test-ds.xml → server/zanata-war/etc/zanata-test-ds.xml b/...c/main/resources-jboss/zanata-test-ds.xml → server/zanata-war/etc/zanata-test-ds.xml