Author: [email protected] Date: Wed Aug 3 12:22:34 2011 New Revision: 1241 Log: [AMDATUAUTH-73] Fixed by moving the config files to a separate artifact
Added: trunk/amdatu-auth/config/ trunk/amdatu-auth/config/pom.xml trunk/amdatu-auth/config/src/ trunk/amdatu-auth/config/src/main/ trunk/amdatu-auth/config/src/main/resources/ trunk/amdatu-auth/config/src/main/resources/org.amdatu.authentication.oauth.consumerregistry.fs.cfg trunk/amdatu-auth/config/src/main/resources/org.amdatu.authentication.oauth.server.cfg Removed: trunk/amdatu-auth/config-fileinstall/ Modified: trunk/amdatu-auth/pom.xml trunk/amdatu-auth/release/pom.xml trunk/amdatu-auth/release/src/main/assembly/bin-component.xml trunk/amdatu-auth/test-integration/tests/ (props changed) Added: trunk/amdatu-auth/config/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-auth/config/pom.xml Wed Aug 3 12:22:34 2011 @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010, 2011 The Amdatu 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.verning 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.amdatu.auth</groupId> + <artifactId>org.amdatu.auth</artifactId> + <version>0.2.0-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.auth.config</artifactId> + <packaging>jar</packaging> + <name>Amdatu Auth configuration files</name> + <description>This artifacts holds the configuration files for Amdatu Auth.</description> + + <repositories> + <repository> + <id>amdatu.releases</id> + <name>Amdatu Release Repository</name> + <url>http://repository.amdatu.org/releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>amdatu.snapshots</id> + <name>Amdatu Snapshot Repository</name> + <url>http://repository.amdatu.org/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>riptano</id> + <name>Riptano Repository</name> + <url>http://mvn.riptano.com/content/repositories/riptano</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + +</project> \ No newline at end of file Added: trunk/amdatu-auth/config/src/main/resources/org.amdatu.authentication.oauth.consumerregistry.fs.cfg ============================================================================== --- (empty file) +++ trunk/amdatu-auth/config/src/main/resources/org.amdatu.authentication.oauth.consumerregistry.fs.cfg Wed Aug 3 12:22:34 2011 @@ -0,0 +1,17 @@ +# Copyright (c) 2010, 2011 The Amdatu 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.verning permissions and limitations +# under the License. + +# Consumer store FS datadirectory +datadir=work/consumerregistrystore \ No newline at end of file Added: trunk/amdatu-auth/config/src/main/resources/org.amdatu.authentication.oauth.server.cfg ============================================================================== --- (empty file) +++ trunk/amdatu-auth/config/src/main/resources/org.amdatu.authentication.oauth.server.cfg Wed Aug 3 12:22:34 2011 @@ -0,0 +1,49 @@ +# Copyright (c) 2010, 2011 The Amdatu 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.verning permissions and limitations +# under the License. + +# The hostname and portnr +hostname=${server.hostname} +portnr=${server.port} +authorizeurl=/oauth-server/jsp/authorize.jsp + +# The lifetime of an OAuth request is limited to request.timestamp.maxage. +# This defines the maximum amount of time between the signing of an OAuth +# request (at which point the oauth_timestamp is added to it) and the +# receipt of the request. +# Defaults to 300000 (5 minutes). +request.timestamp.maxage=300000 + +# The lifetime of a request token is limited to request.token.maxage. It must +# be exchanged for an access token before this maxage. If the request token +# reached its maxage it is invalidated and cannot be exchanged for an access +# token anymore. +# Defaults to 300000 (5 minutes). +request.token.maxage=300000 + +# The lifetime of an access token is limited to access.token.maxage. This is +# an absolute maximum; the token always expires after this amount of milliseconds, +# even if the token is still actively used. Can be a negative number, in which case +# the access token does not expire. Can be used in combination with access.token.timeout, +# in which case BOTH apply. +# Defaults to -1 (no maximum age). +access.token.maxage=-1 + +# The access token is invalidated when it is not used (that is; send along +# with an OAuth request) for more then access.token.timeout milliseconds. +# Defaults to 1800000, meaning that the access token becomes invalid when +# it not used for a duration of 30 minutes. +# May be a negative number, in which case the access token does not timeout. +# Can be used in combination with access.token.timeout, in which case BOTH apply. +access.token.timeout=1800000 \ No newline at end of file Modified: trunk/amdatu-auth/pom.xml ============================================================================== --- trunk/amdatu-auth/pom.xml (original) +++ trunk/amdatu-auth/pom.xml Wed Aug 3 12:22:34 2011 @@ -160,6 +160,13 @@ <scope>provided</scope> <type>bundle</type> </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.config</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + <type>jar</type> + </dependency> <!-- Dependency setup for amdatu-core project --> <dependency> @@ -412,7 +419,7 @@ <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.compile.classpath"/> <available file="${project.build.directory}/${project.build.finalName}.jar" property="fileExists" value="true"/> - <available file="../config-fileinstall" property="configFileDirExists" value="true"/> + <available file="../config" property="configFileDirExists" value="true"/> <if> <isset property="fileExists" /> @@ -432,7 +439,7 @@ <isset property="configFileDirExists" /> <then> <copy todir="${amdatu.deploy.directory}" overwrite="false"> - <fileset dir="../config-fileinstall"/> + <fileset dir="../config/src/main/resources"/> </copy> </then> </if> Modified: trunk/amdatu-auth/release/pom.xml ============================================================================== --- trunk/amdatu-auth/release/pom.xml (original) +++ trunk/amdatu-auth/release/pom.xml Wed Aug 3 12:22:34 2011 @@ -88,6 +88,12 @@ <scope>runtime</scope> <type>bundle</type> </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.config</artifactId> + <scope>runtime</scope> + <type>jar</type> + </dependency> </dependencies> <profiles> Modified: trunk/amdatu-auth/release/src/main/assembly/bin-component.xml ============================================================================== --- trunk/amdatu-auth/release/src/main/assembly/bin-component.xml (original) +++ trunk/amdatu-auth/release/src/main/assembly/bin-component.xml Wed Aug 3 12:22:34 2011 @@ -35,15 +35,24 @@ <unpack>false</unpack> <useTransitiveDependencies>false</useTransitiveDependencies> </dependencySet> + + <dependencySet> + <outputDirectory>conf</outputDirectory> + <includes> + <include>org.amdatu.auth:org.amdatu.auth.config</include> + </includes> + <unpack>true</unpack> + <unpackOptions> + <includes> + <include>*.cfg</include> + </includes> + </unpackOptions> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> </dependencySets> <fileSets> <fileSet> - <directory>../config-fileinstall</directory> - <outputDirectory>conf</outputDirectory> - <filtered>true</filtered> - </fileSet> - <fileSet> <directory>src/main/resources</directory> <outputDirectory></outputDirectory> <filtered>true</filtered> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
