Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Remove individual profiles for building different artifacts.
Browse files Browse the repository at this point in the history 
- Enable JAAS authentication always (previously only for non-internal).
- Fixed web.xml and components.xml
  • Loading branch information
Carlos Munoz committed Jul 24, 2012
1 parent d6d1a36 commit bc0af3b
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 162 deletions.
152 changes: 0 additions & 152 deletions zanata-war/pom.xml
View file
Expand Up @@ -637,158 +637,6 @@
</properties>
</profile>

<profile>
<id>fedora</id>
<activation>
<property>
<name>!internalAuth</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<executions>
<execution>
<id>generate-fedora-war</id>
<goals>
<goal>war</goal>
</goals>
<phase>package</phase>
<configuration>
<classifier>fedora</classifier>
<webappDirectory>${project.build.directory}/${project.build.finalName}-fedora</webappDirectory>
<filters>
<filter>${war.config.dir}/fedora.properties</filter>
<filter>${war.config.dir}/mysql.properties</filter>
</filters>
<archive>
<manifestEntries>
<Classifier>fedora</Classifier>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>kerberos</id>
<activation>
<property>
<name>!internalAuth</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<executions>
<execution>
<id>generate-kerberos-war</id>
<goals>
<goal>war</goal>
</goals>
<phase>package</phase>
<configuration>
<classifier>kerberos</classifier>
<webappDirectory>${project.build.directory}/${project.build.finalName}-kerberos</webappDirectory>
<filters>
<filter>${war.config.dir}/kerberos.properties</filter>
<filter>${war.config.dir}/mysql.properties</filter>
</filters>
<archive>
<manifestEntries>
<Classifier>kerberos</Classifier>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>jaas</id>
<activation>
<property>
<name>!internalAuth</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<executions>
<execution>
<id>generate-jaas-war</id>
<goals>
<goal>war</goal>
</goals>
<phase>package</phase>
<configuration>
<classifier>jaas</classifier>
<webappDirectory>${project.build.directory}/${project.build.finalName}-jaas</webappDirectory>
<filters>
<filter>${war.config.dir}/jaas.properties</filter>
<filter>${war.config.dir}/mysql.properties</filter>
</filters>
<archive>
<manifestEntries>
<Classifier>jaas</Classifier>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>autotest</id>
<activation>
<property>
<name>!internalAuth</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<executions>
<execution>
<id>generate-autotest-war</id>
<goals>
<goal>war</goal>
</goals>
<phase>package</phase>
<configuration>
<classifier>autotest</classifier>
<webappDirectory>${project.build.directory}/${project.build.finalName}-autotest</webappDirectory>
<filters>
<filter>${war.config.dir}/autotest.properties</filter>
<filter>${war.config.dir}/h2.properties</filter>
</filters>
<archive>
<manifestEntries>
<Classifier>autotest</Classifier>
</manifestEntries>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<!-- This profile tells GWT to use an alternative GWT module which has
only one permutation, and to compile in draft mode -->
Expand Down
46 changes: 41 additions & 5 deletions zanata-war/src/etc/zanata.properties
View file
@@ -1,9 +1,45 @@
# Zanata general configuration properties.
#
# Make sure this file is available on the server classpath when deployin.
# Make sure this file is available on the server classpath when deploying.
# If not, then default values will be assumed.

zanata.security.auth.type = internal
zanata.security.roles.admin =
zanata.email.outgoing.url = localhost:8080
zanata.host.url = http://localhost:8080/zanata
# Zanata Authentication type
# Valid values:
# INTERNAL, KERBEROS, FEDORA_OPENID,JAAS
zanata.security.auth.type = INTERNAL

# User id's that should be made administrators
zanata.security.roles.admin = admin

# Outgoing email (SMTP) host configuration
zanata.email.outgoing.host = localhost
zanata.email.outgoing.port = 25

# Zanata host url (for outgoing communications)
zanata.host.url = http://localhost:8080/zanata


# Zanata optional configurable properties
# (This will only be applied if NO OTHER value is configured, and
# will be overriden by values configured in Zanata itself)

# Zanata host name
zanata.host

# Zanata registration url
zanata.register.url

# Zanata Email domain
zanata.email.domain

# Zanata administrator email address (when sending)
zanata.email.admin.addr

# Email address used when sending emails
zanata.email.from.addr

# Home content (HTML format)
zanata.home.content

# Help Content (HTML format)
zanata.help.content
2 changes: 1 addition & 1 deletion zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
View file
Expand Up @@ -45,7 +45,7 @@
url-pattern="/*"/>

<!-- Login and security -->
<security:identity jaas-config-name="@jaas.configure@" />
<security:identity jaas-config-name="zanata" />
<web:identity-filter disabled="true"/>

<!--
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
View file
Expand Up @@ -14,7 +14,7 @@ in case changes are required for production deployment (eg cfengine).
<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
</loader-repository>
</class-loading>
<security-domain>java:/jaas/${jaas.configure}</security-domain>
<security-domain>java:/jaas/zanata</security-domain>
<!-- _context_root_ -->
<depends>jboss.jca:service=DataSourceBinding,name=${ds.jndi.name}</depends>
</jboss-web>
6 changes: 3 additions & 3 deletions zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
View file
Expand Up @@ -5,7 +5,7 @@

<!-- sso security -->

<!-- Kerberos only (also configurable on JBOSS_HOME/server/<config>/deployers/jbossweb.deployer/web/xml)
<!-- Kerberos only (also configurable on JBOSS_HOME/server/<config>/deployers/jbossweb.deployer/web.xml)
<security-constraint>
<web-resource-collection>
Expand Down Expand Up @@ -220,7 +220,7 @@
<url-pattern>/webtrans/gwteventservice</url-pattern>
</servlet-mapping>

<!-- @h2console.servlet.start@
<!-- Uncomment this to enable the H2Console
<servlet>
<servlet-name>H2Console</servlet-name>
Expand All @@ -232,7 +232,7 @@
<url-pattern>/console/*</url-pattern>
</servlet-mapping>
@h2console.servlet.end@ -->
-->

<security-constraint>
<display-name>Restrict raw XHTML Documents</display-name>
Expand Down

0 comments on commit bc0af3b

Please sign in to comment.