Skip to content
Browse files

tag for release with fix of security bug

  • Loading branch information...
2 parents 79af30a + 2d9adba commit a46f62c5b9e37a19e9e6bb718c6131a98940e969 Richard Hirsch committed Feb 21, 2010
View
42 .gitignore
@@ -1,42 +0,0 @@
-# use glob syntax.
-syntax: glob
-*.ser
-*.class
-*~
-*.bak
-*.off
-*.old
-.DS_Store
-
-# logs
-derby.log
-esme_test_db
-
-# eclipse conf file
-.settings
-.classpath
-.project
-.manager
-
-# building
-target
-build
-null
-tmp*
-dist
-test-output
-
-# other scm
-.svn
-.CVS
-.hg*
-
-# switch to regexp syntax.
-# syntax: regexp
-# ^\.pc/
-
-
-# IntelliJ
-*.iml
-*.ipr
-*.iws
View
22 README.txt
@@ -20,29 +20,13 @@ fully endorsed by the ASF.
See http://incubator.apache.org/projects/ESME.html for the current
incubation status of the Apache ESME project.
-License (see also LICENSE.txt)
-==============================
-
-Collective work: Copyright 2007 The Apache Software Foundation.
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You 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.
Building ESME
=============
+Please note that ESME currently only works with JDK 1.6. We are hopeful
+that JDK 1.5 will soon be supported.
+
You can build the ESME sources using the Maven 2 build system. Execute the
following command in the ESME source directory to build the sources and
to start the application via jetty:
View
19 esme-java-client/.classpath
@@ -1,3 +1,22 @@
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+-->
+
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
View
19 esme-java-client/.project
@@ -1,3 +1,22 @@
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+-->
+
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>EsmeRestApi</name>
View
18 esme-java-client/pom.xml
@@ -1,3 +1,21 @@
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+-->
<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>
View
18 esme-java-client/src/main/java/org/apache/esme/api/EsmeException.java
@@ -1,3 +1,21 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+*/
package org.apache.esme.api;
public class EsmeException extends RuntimeException {
View
23 esme-java-client/src/main/java/org/apache/esme/api/EsmeRestApi.java
@@ -1,9 +1,22 @@
/*
- * Created on 02-Oct-2008
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+*/
+
package org.apache.esme.api;
import java.io.ByteArrayInputStream;
View
24 esme-java-client/src/main/java/org/apache/esme/model/Message.java
@@ -1,13 +1,25 @@
/*
- * Created on 05-Oct-2008
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+*/
+
package org.apache.esme.model;
/**
- * @author I056593
*
* To change the template for this generated type comment go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
View
21 esme-java-client/src/main/java/org/apache/esme/model/Status.java
@@ -1,7 +1,22 @@
/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+*/
+
package org.apache.esme.model;
/**
View
19 esme-java-client/src/test/java/org/apache/esme/api/RestTest.java
@@ -1,3 +1,22 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+*/
+
package org.apache.esme.api;
import java.io.IOException;
View
20 esme-java-client/src/test/java/org/apache/esme/api/TestProperties.java
@@ -1,6 +1,22 @@
/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+-->
*/
package org.apache.esme.api;
View
18 esme-java-client/src/test/resources/props/test.properties
@@ -1,3 +1,21 @@
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+-->
# Substitute the values below with your own token and ESME test server details
esme-token=XNVNYBSLXIASO2T4IVO0N0ZN4MGZPJOI
esme-server=http://localhost:8080/api
View
669 server/pom.xml
@@ -1,347 +1,322 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <groupId>org.apache.esme</groupId>
- <artifactId>esme-server</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>ESME</name>
- <inceptionYear>2008</inceptionYear>
- <properties>
- <lift.version>1.1-SNAPSHOT</lift.version>
- <scala.version>2.7.7</scala.version>
- <compass.version>2.1.1</compass.version>
- <lucene.version>2.4.0</lucene.version>
- <netbeans.hint.deploy.server>gfv3</netbeans.hint.deploy.server>
- <scala.stats.version>1.3</scala.stats.version>
- </properties>
-
- <repositories>
- <repository>
- <id>scala-tools.org</id>
- <name>Scala-Tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </repository>
- <repository>
- <id>scala-tools.org.snapshots</id>
- <name>Scala-Tools Maven2 Repository for Snapshots</name>
- <url>http://scala-tools.org/repo-snapshots</url>
- <snapshots/>
- </repository>
- <repository>
- <id>compass-project.org</id>
- <name>Compass</name>
- <url>http://repo.compass-project.org</url>
- </repository>
- <repository>
- <id>scala-stats</id>
- <name>Twitter Repo</name>
- <url>http://www.lag.net/nest</url>
- </repository>
- <repository>
- <id>configgy</id>
- <name>Another Twitter Repo</name>
- <url>http://www.lag.net/repo</url>
- </repository>
- <repository>
- <id>opendmk</id>
- <name>Java Dynamic Management Kit</name>
- <url>http://maven.tigase.org/</url>
- </repository>
- <repository>
- <id>Apache Repo</id>
- <name>Apache repository for Derby 10.5.1.1</name>
- <url>http://people.apache.org/repo/m1-ibiblio-rsync-repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>scala-tools.org</id>
- <name>Scala-Tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
- </pluginRepository>
- </pluginRepositories>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.4.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-
- <dependencies>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.4.4</version>
- </dependency>
- <dependency>
- <groupId>org.openid4java</groupId>
- <artifactId>openid4java</artifactId>
- <version>0.9.5</version>
- </dependency>
-
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-util</artifactId>
- <version>${lift.version}</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-webkit</artifactId>
- <version>${lift.version}</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-widgets</artifactId>
- <version>${lift.version}</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-mapper</artifactId>
- <version>${lift.version}</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-testkit</artifactId>
- <version>${lift.version}</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-openid</artifactId>
- <version>${lift.version}</version>
- </dependency>
- <dependency>
- <groupId>net.liftweb</groupId>
- <artifactId>lift-textile</artifactId>
- <version>${lift.version}</version>
- </dependency>
- <!--
- <dependency>
- <groupId>com.socialmaterial</groupId>
- <artifactId>social</artifactId>
- <version>0.1-SNAPSHOT</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.compass-project</groupId>
- <artifactId>compass</artifactId>
- <version>${compass.version}</version>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.2-507.jdbc3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.5.1.1</version>
- </dependency>
- <!--
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.2.124</version>
- </dependency>
- -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.1_3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-htmlunit-plugin</artifactId>
- <version>1.4.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>[6.1.6,)</version>
- <scope>test</scope>
- </dependency>
- <!-- for LiftConsole -->
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala.version}</version>
- <!--<scope>test</scope>-->
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-snowball</artifactId>
- <version>${lucene.version}</version>
- </dependency>
- <!-- for stats gathering and jmx -->
- <dependency>
- <groupId>com.twitter</groupId>
- <artifactId>stats</artifactId>
- <version>${scala.stats.version}</version>
- </dependency>
- <dependency>
- <groupId>openDMK</groupId>
- <artifactId>jdmkrt</artifactId>
- <version>1.0-b02</version>
- </dependency>
- <!-- end stats and jmx -->
- <dependency>
- <groupId>org.scala-tools.testing</groupId>
- <artifactId>specs</artifactId>
- <version>1.6.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <sourceDirectory>src/main/scala</sourceDirectory>
- <testSourceDirectory>src/test/scala</testSourceDirectory>
-
- <plugins>
-
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>2.9</version>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jvmArgs>
- <jvmArg>-Xmx1024m</jvmArg>
- </jvmArgs>
- <scalaVersion>${scala.version}</scalaVersion>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <contextPath>/</contextPath>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- </configuration>
- </plugin>
- <plugin>
- <groupId>net.sf.alchim</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <nosuffix>true</nosuffix>
- <jswarn>false</jswarn>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- <excludes>
- <exclude>org.scala-lang:scala-library</exclude>
- </excludes>
- <classpathContainers>
- <classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER</classpathContainer>
- </classpathContainers>
- <projectnatures>
- <java.lang.String>ch.epfl.lamp.sdt.core.scalanature</java.lang.String>
- <java.lang.String>org.eclipse.jdt.core.javanature</java.lang.String>
- </projectnatures>
- <buildcommands>
- <java.lang.String>ch.epfl.lamp.sdt.core.scalabuilder</java.lang.String>
- </buildcommands>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <configuration>
- <jvmArgs>
- <jvmArg>-Xmx1024m</jvmArg>
- </jvmArgs>
-
- <scalaVersion>${scala.version}</scalaVersion>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one *
+ or more contributor license agreements. See the NOTICE file *
+ distributed with this work for additional information *
+ regarding copyright ownership. The ASF licenses this file *
+ to you 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. *
+-->
+<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>
+ <groupId>org.apache.esme</groupId>
+ <artifactId>esme-server</artifactId>
+ <version>apache-esme-1.0-incubating</version>
+ <packaging>war</packaging>
+ <name>Apache Enterprise Social Messaging Experiment (ESME)</name>
+ <inceptionYear>2008</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>LICENSE.txt</url>
+ </license>
+ </licenses>
+ <mailingLists>
+ <mailingList>
+ <name>ESME Dev List</name>
+ <subscribe>esme-dev-subscribe@incubator.apache.org</subscribe>
+ <unsubscribe>esme-dev-unsubscribe@incubator.apache.org</unsubscribe>
+ <post>esme-dev@incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-esme-dev/</archive>
+ </mailingList>
+ </mailingLists>
+ <properties>
+ <lift.version>1.1-M8</lift.version>
+ <scala.version>2.7.7</scala.version>
+ <compass.version>2.1.1</compass.version>
+ <lucene.version>2.4.0</lucene.version>
+ <netbeans.hint.deploy.server>gfv3</netbeans.hint.deploy.server>
+ <scala.stats.version>1.3</scala.stats.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>Base</id>
+ <name>http://repo2.maven.org/maven2/</name>
+ <url>http://repo2.maven.org/maven2/</url>
+ </repository>
+ <repository>
+ <id>scala-tools.org</id>
+ <name>Scala-Tools Maven2 Repository</name>
+ <url>http://scala-tools.org/repo-releases</url>
+ </repository>
+ <repository>
+ <id>scala-tools.org.snapshots</id>
+ <name>Scala-Tools Maven2 Repository for Snapshots</name>
+ <url>http://scala-tools.org/repo-snapshots</url>
+ <snapshots/>
+ </repository>
+ <repository>
+ <id>compass-project.org</id>
+ <name>Compass</name>
+ <url>http://repo.compass-project.org</url>
+ </repository>
+ <repository>
+ <id>scala-stats</id>
+ <name>Twitter Repo</name>
+ <url>http://www.lag.net/nest</url>
+ </repository>
+ <repository>
+ <id>Configgy</id>
+ <name>http://www.lag.net/repo</name>
+ <url>http://www.lag.net/repo</url>
+ </repository>
+ <repository>
+ <id>Apache Repo</id>
+ <name>Apache repository for Derby 10.5.1.1</name>
+ <url>http://people.apache.org/repo/m1-ibiblio-rsync-repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>scala-tools.org</id>
+ <name>Scala-Tools Maven2 Repository</name>
+ <url>http://scala-tools.org/repo-releases</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java</artifactId>
+ <version>0.9.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-util</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-webkit</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-widgets</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-mapper</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-testkit</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.liftweb</groupId>
+ <artifactId>lift-openid</artifactId>
+ <version>${lift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.compass-project</groupId>
+ <artifactId>compass</artifactId>
+ <version>${compass.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.2-507.jdbc3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.5.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>[6.1.6,)</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- for LiftConsole -->
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ <version>${scala.version}</version>
+ <!--<scope>test</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-snowball</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.twitter</groupId>
+ <artifactId>stats</artifactId>
+ <version>${scala.stats.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-tools.testing</groupId>
+ <artifactId>specs</artifactId>
+ <version>1.6.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/main/scala</sourceDirectory>
+ <testSourceDirectory>src/test/scala</testSourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <jvmArgs>
+ <jvmArg>-Xmx1024m</jvmArg>
+ </jvmArgs>
+ <scalaVersion>${scala.version}</scalaVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <contextPath>/</contextPath>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>net.sf.alchim</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <nosuffix>true</nosuffix>
+ <jswarn>false</jswarn>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <excludes>
+ <exclude>org.scala-lang:scala-library</exclude>
+ </excludes>
+ <classpathContainers>
+ <classpathContainer>ch.epfl.lamp.sdt.launching.SCALA_CONTAINER</classpathContainer>
+ </classpathContainers>
+ <projectnatures>
+ <java.lang.String>ch.epfl.lamp.sdt.core.scalanature</java.lang.String>
+ <java.lang.String>org.eclipse.jdt.core.javanature</java.lang.String>
+ </projectnatures>
+ <buildcommands>
+ <java.lang.String>ch.epfl.lamp.sdt.core.scalabuilder</java.lang.String>
+ </buildcommands>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <configuration>
+ <jvmArgs>
+ <jvmArg>-Xmx1024m</jvmArg>
+ </jvmArgs>
+
+ <scalaVersion>${scala.version}</scalaVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
+
View
6 server/src/main/resources/props/default.props
@@ -15,7 +15,5 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
-
-compass_config_file=/props/compass.jdbc.cfg.xml
-role.api_test=integration-admin
+ */
+
View
6 server/src/main/resources/props/test.default.props
@@ -15,5 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
- role.api_test=integration-admin
+ */
+
+compass_config_file=/props/compass.filesystem.cfg.xml
+role.api_test=integration-admin
View
22 server/src/test/scala/org/apache/esme/JettySetup.scala
@@ -26,8 +26,7 @@ import org.specs.runner.ConsoleRunner
import net.liftweb.util._
import net.liftweb.common._
import org.specs.matcher._
-import Helpers._
-import net.sourceforge.jwebunit.junit.WebTester
+import Helpers._
import org.mortbay.jetty.Server
import org.mortbay.jetty.servlet.{Context, FilterHolder}
import org.mortbay.jetty.servlet.ServletHolder
@@ -70,24 +69,7 @@ object JettyTestServer {
def stop() = {
server_.stop()
server_.join()
- }
-
- def browse(startPath: String, f:(WebTester) => Unit) = {
- val wc = new WebTester()
- try {
- wc.setScriptingEnabled(false)
- wc.beginAt(JettyTestServer.urlFor(startPath))
- f(wc)
- } catch {
- case exc: AssertionFailedError => {
- System.err.println("serveur response: ", wc.getServeurResponse())
- throw exc
- }
- } finally {
- wc.closeBrowser()
- }
- }
-
+ }
}
View
4 server/src/test/scala/org/apache/esme/api/API2Test.scala
@@ -27,7 +27,6 @@ import net.liftweb.common._
import net.liftweb.mapper.{By}
import org.specs.matcher._
import Helpers._
-import net.sourceforge.jwebunit.junit.WebTester
import org.mortbay.jetty.Server
import org.mortbay.jetty.servlet.{Context, FilterHolder}
import org.mortbay.jetty.servlet.ServletHolder
@@ -36,8 +35,7 @@ import org.apache.esme._
import model._
import net.liftweb.http._
import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
-
-import net.sourceforge.jwebunit.junit.WebTester
+
import _root_.junit.framework.AssertionFailedError
class Api2SpecsAsTest extends JUnit3(Api2Specs)
View
6 server/src/test/scala/org/apache/esme/api/ApiTest.scala
@@ -25,17 +25,15 @@ import org.specs.runner.ConsoleRunner
import net.liftweb.util._
import net.liftweb.common._
import org.specs.matcher._
-import Helpers._
-import net.sourceforge.jwebunit.junit.WebTester
+import Helpers._
import org.mortbay.jetty.Server
import org.mortbay.jetty.servlet.{Context, FilterHolder}
import org.mortbay.jetty.servlet.ServletHolder
import org.mortbay.jetty.webapp.WebAppContext
import org.apache.esme._
import model._
import net.liftweb.http._
-
-import net.sourceforge.jwebunit.junit.WebTester
+
import _root_.junit.framework.AssertionFailedError
import testing.{ReportFailure, TestKit, HttpResponse, TestFramework, Response}
View
6 server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala
@@ -26,8 +26,7 @@ import net.liftweb.util._
import net.liftweb.common._
import org.specs.matcher._
import Helpers._
-import MsgParser._
-import net.sourceforge.jwebunit.junit.WebTester
+import MsgParser._
import org.mortbay.jetty.Server
import org.mortbay.jetty.servlet.{Context, FilterHolder}
import org.mortbay.jetty.servlet.ServletHolder
@@ -36,8 +35,7 @@ import org.apache.esme._
import model._
import net.liftweb.http._
import testing.{ReportFailure, TestKit, HttpResponse, TestFramework}
-
-import net.sourceforge.jwebunit.junit.WebTester
+
import _root_.junit.framework.AssertionFailedError
class MsgParserSpecsAsTest extends JUnit3(MsgParserSpecs)

0 comments on commit a46f62c

Please sign in to comment.
Something went wrong with that request. Please try again.