Author: [email protected]
Date: Fri May 11 17:08:47 2012
New Revision: 2345
Log:
[AMDATUAUTH-123] Disabled itests, applied some provisioning fixes and added
amdatu maven plugin for AMS deployment
Modified:
trunk/amdatu-auth/auth-stores/fs-store-consumer/pom.xml
trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml
trunk/amdatu-auth/auth-stores/mem-store-nonce/pom.xml
trunk/amdatu-auth/auth-stores/mem-store-token/pom.xml
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.consumerregistry.fs.xml
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.server.xml
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.tokenprovider.xml
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.tools.loghandler.xml
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.useradmin.rest.xml
trunk/amdatu-auth/login-service/pom.xml
trunk/amdatu-auth/oauth-api/pom.xml
trunk/amdatu-auth/oauth-client/pom.xml
trunk/amdatu-auth/oauth-consumerregistry/pom.xml
trunk/amdatu-auth/oauth-example/pom.xml
trunk/amdatu-auth/oauth-server/pom.xml
trunk/amdatu-auth/test-performance/test-analyzer/src/main/java/org/amdatu/auth/test/performance/analyzer/analysis/FrequencyDiagram.java
trunk/amdatu-auth/test-performance/test-analyzer/src/main/java/org/amdatu/auth/test/performance/analyzer/analysis/ZSamples.java
trunk/amdatu-auth/tokenprovider/pom.xml
trunk/amdatu-auth/tools/loghandler/pom.xml
trunk/amdatu-auth/tools/pom.xml
trunk/amdatu-auth/tools/shellcommands/pom.xml
trunk/amdatu-auth/useradmin-rest/pom.xml
Modified: trunk/amdatu-auth/auth-stores/fs-store-consumer/pom.xml
==============================================================================
--- trunk/amdatu-auth/auth-stores/fs-store-consumer/pom.xml (original)
+++ trunk/amdatu-auth/auth-stores/fs-store-consumer/pom.xml Fri May 11
17:08:47 2012
@@ -25,7 +25,11 @@
<artifactId>org.amdatu.auth.oauth.store.consumer.fs</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Auth - File based OAuth consumer store</name>
- <description>This bundle implements a persistent storage for OAuth service
consumers</description>
+ <description>File based storage for OAuth service consumers</description>
+
+ <properties>
+ <deploy_to_ams>true</deploy_to_ams>
+ </properties>
<dependencies>
<!-- Provided dependencies -->
@@ -99,6 +103,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml
==============================================================================
--- trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml (original)
+++ trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml Fri May 11
17:08:47 2012
@@ -87,6 +87,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/auth-stores/mem-store-nonce/pom.xml
==============================================================================
--- trunk/amdatu-auth/auth-stores/mem-store-nonce/pom.xml (original)
+++ trunk/amdatu-auth/auth-stores/mem-store-nonce/pom.xml Fri May 11
17:08:47 2012
@@ -81,6 +81,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/auth-stores/mem-store-token/pom.xml
==============================================================================
--- trunk/amdatu-auth/auth-stores/mem-store-token/pom.xml (original)
+++ trunk/amdatu-auth/auth-stores/mem-store-token/pom.xml Fri May 11
17:08:47 2012
@@ -80,6 +80,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified:
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.consumerregistry.fs.xml
==============================================================================
---
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.consumerregistry.fs.xml
(original)
+++
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.consumerregistry.fs.xml
Fri May 11 17:08:47 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(org.amdatu.tenant.pid=${amdatu.tenant.id})">
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(org.amdatu.tenant.pid=${amdatu.tenant.id})">
<OCD name="Amdatu Auth - OAuth Consumer FS Store Config"
id="org.amdatu.auth.oauth.consumerregistry.fs">
<AD id="datadir" type="STRING" cardinality="0" />
</OCD>
Modified:
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.server.xml
==============================================================================
---
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.server.xml
(original)
+++
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.oauth.server.xml
Fri May 11 17:08:47 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(org.amdatu.tenant.pid=${amdatu.tenant.id})">
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(org.amdatu.tenant.pid=${amdatu.tenant.id})">
<OCD name="Amdatu Auth - OAuth Consumer FS Store Config"
id="org.amdatu.auth.oauth.server">
<AD id="hostname" type="STRING" cardinality="0" />
<AD id="portnr" type="STRING" cardinality="0" />
Modified:
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.tokenprovider.xml
==============================================================================
---
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.tokenprovider.xml
(original)
+++
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.tokenprovider.xml
Fri May 11 17:08:47 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(org.amdatu.tenant.pid=${amdatu.tenant.id})">
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(org.amdatu.tenant.pid=${amdatu.tenant.id})">
<OCD name="Amdatu Auth - Token provider config"
id="org.amdatu.auth.tokenprovider">
<AD id="secretkey" type="STRING" cardinality="0" />
</OCD>
Modified:
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.tools.loghandler.xml
==============================================================================
---
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.tools.loghandler.xml
(original)
+++
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.tools.loghandler.xml
Fri May 11 17:08:47 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(|(!(org.amdatu.tenant.pid=*))(org.amdatu.tenant.pid=org.amdatu.tenant.PLATFORM))">
<OCD id="org.amdatu.auth.tools.loghandler" name="Amdatu Loghandler">
<AD id="console.mininum.loglevel" name="console.mininum.loglevel"
type="String" description="This settings indicates the loglevels of messages
that will be printed to the console. Can be DEBUG, INFO, WARNING or ERROR. For
example if 'INFO' is defined, only log messages will be printed in the console
which have a loglevel of INFO or higher (WARNING or ERROR)."/>
</OCD>
Modified:
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.useradmin.rest.xml
==============================================================================
---
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.useradmin.rest.xml
(original)
+++
trunk/amdatu-auth/config/src/main/resources/org.amdatu.auth.useradmin.rest.xml
Fri May 11 17:08:47 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(org.amdatu.tenant.pid=${amdatu.tenant.id})">
+<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.1.0";
filter="(org.amdatu.tenant.pid=${amdatu.tenant.id})">
<OCD name="Amdatu Auth - UserAdmin REST service config"
id="org.amdatu.auth.useradmin.rest">
<AD id="password.minimum_length" type="INTEGER" cardinality="0" />
<AD id="password.require_mixed_case" type="BOOLEAN" cardinality="0" />
Modified: trunk/amdatu-auth/login-service/pom.xml
==============================================================================
--- trunk/amdatu-auth/login-service/pom.xml (original)
+++ trunk/amdatu-auth/login-service/pom.xml Fri May 11 17:08:47 2012
@@ -106,6 +106,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/oauth-api/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-api/pom.xml (original)
+++ trunk/amdatu-auth/oauth-api/pom.xml Fri May 11 17:08:47 2012
@@ -128,6 +128,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/oauth-client/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-client/pom.xml (original)
+++ trunk/amdatu-auth/oauth-client/pom.xml Fri May 11 17:08:47 2012
@@ -126,6 +126,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/oauth-consumerregistry/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-consumerregistry/pom.xml (original)
+++ trunk/amdatu-auth/oauth-consumerregistry/pom.xml Fri May 11 17:08:47 2012
@@ -151,6 +151,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/oauth-example/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-example/pom.xml (original)
+++ trunk/amdatu-auth/oauth-example/pom.xml Fri May 11 17:08:47 2012
@@ -31,23 +31,4 @@
<module>provider</module>
</modules>
- <profiles>
- <profile>
- <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
- the deploy profile is activated -->
- <id>deploy</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: trunk/amdatu-auth/oauth-server/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-server/pom.xml (original)
+++ trunk/amdatu-auth/oauth-server/pom.xml Fri May 11 17:08:47 2012
@@ -146,6 +146,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified:
trunk/amdatu-auth/test-performance/test-analyzer/src/main/java/org/amdatu/auth/test/performance/analyzer/analysis/FrequencyDiagram.java
==============================================================================
---
trunk/amdatu-auth/test-performance/test-analyzer/src/main/java/org/amdatu/auth/test/performance/analyzer/analysis/FrequencyDiagram.java
(original)
+++
trunk/amdatu-auth/test-performance/test-analyzer/src/main/java/org/amdatu/auth/test/performance/analyzer/analysis/FrequencyDiagram.java
Fri May 11 17:08:47 2012
@@ -74,6 +74,10 @@
}
public double getGoodnessOfFit() {
+ if (m_sd == 0) {
+ // No SD
+ return 100;
+ }
long[] observed = new long[INTERVALS];
double[] expected = new double[INTERVALS];
double interval = (m_max - m_min) / INTERVALS;
Modified:
trunk/amdatu-auth/test-performance/test-analyzer/src/main/java/org/amdatu/auth/test/performance/analyzer/analysis/ZSamples.java
==============================================================================
---
trunk/amdatu-auth/test-performance/test-analyzer/src/main/java/org/amdatu/auth/test/performance/analyzer/analysis/ZSamples.java
(original)
+++
trunk/amdatu-auth/test-performance/test-analyzer/src/main/java/org/amdatu/auth/test/performance/analyzer/analysis/ZSamples.java
Fri May 11 17:08:47 2012
@@ -196,11 +196,23 @@
return sampleMeanSize;
}
+ private String normalize(String stepName) {
+ String normName = stepName;
+ normName = normName.replace("/", "_");
+ normName = normName.replace("\\", "_");
+ normName = normName.replace(":", "_");
+ normName = normName.replace("?", "_");
+ normName = normName.replace("\"", "");
+ normName = normName.replace("<", "[");
+ normName = normName.replace(">", "]");
+ return normName;
+ }
+
private void preProcess(List<XYSample> x, List<XYSample> y) throws
MathException {
if (x.size() != y.size()) {
Logger.log("Mismatch in sample sizes: X=" + x.size() + ", Y=" +
y.size());
}
- name = x.get(0).stepName;
+ name = normalize(x.get(0).stepName);
// Generate new sample means
int newSampleSize = getSampleSize(x.size());
Modified: trunk/amdatu-auth/tokenprovider/pom.xml
==============================================================================
--- trunk/amdatu-auth/tokenprovider/pom.xml (original)
+++ trunk/amdatu-auth/tokenprovider/pom.xml Fri May 11 17:08:47 2012
@@ -97,6 +97,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/tools/loghandler/pom.xml
==============================================================================
--- trunk/amdatu-auth/tools/loghandler/pom.xml (original)
+++ trunk/amdatu-auth/tools/loghandler/pom.xml Fri May 11 17:08:47 2012
@@ -78,6 +78,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/tools/pom.xml
==============================================================================
--- trunk/amdatu-auth/tools/pom.xml (original)
+++ trunk/amdatu-auth/tools/pom.xml Fri May 11 17:08:47 2012
@@ -31,9 +31,11 @@
<module>config</module>
<module>fsstore</module>
<module>loghandler</module>
+ <!-- FIXME
<module>itest</module>
+ -->
<module>rest</module>
<module>rest-doclet</module>
- <module>shell-commands</module>
+ <module>shellcommands</module>
</modules>
</project>
Modified: trunk/amdatu-auth/tools/shellcommands/pom.xml
==============================================================================
--- trunk/amdatu-auth/tools/shellcommands/pom.xml (original)
+++ trunk/amdatu-auth/tools/shellcommands/pom.xml Fri May 11 17:08:47 2012
@@ -65,6 +65,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/amdatu-auth/useradmin-rest/pom.xml
==============================================================================
--- trunk/amdatu-auth/useradmin-rest/pom.xml (original)
+++ trunk/amdatu-auth/useradmin-rest/pom.xml Fri May 11 17:08:47 2012
@@ -142,6 +142,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.amdatu.maven</groupId>
+ <artifactId>org.amdatu.maven.plugin</artifactId>
+ </plugin>
</plugins>
</build>
</profile>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
