Commit 7d23cee8 authored by shake's avatar shake
Browse files

IMS glassfish 3 compatibility

git-svn-id: https://subversion.umiacs.umd.edu/ace/trunk@176 f1b3a171-7291-4a19-a512-95ad0ad9394a
parent 0966ad2a
<?xml version="1.0"?> <?xml version="1.0"?>
<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/xsd/maven-4.0.0.xsd"> <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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>ace</artifactId> <artifactId>ace</artifactId>
<groupId>edu.umiacs.ace</groupId> <groupId>edu.umiacs.ace</groupId>
<version>1.7.1-SNAPSHOT</version> <version>1.7.1-SNAPSHOT</version>
</parent> </parent>
<packaging>ear</packaging> <packaging>ear</packaging>
<groupId>edu.umiacs.ace</groupId> <groupId>edu.umiacs.ace</groupId>
<artifactId>ace-ims-ear</artifactId> <artifactId>ace-ims-ear</artifactId>
<name>ace-ims-ear</name> <name>ace-ims-ear</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netbeans.hint.deploy.server>gfv3ee6</netbeans.hint.deploy.server> <netbeans.hint.deploy.server>gfv3ee6</netbeans.hint.deploy.server>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>1.45</version>
</dependency>
<dependency> <dependency>
<groupId>edu.umiacs.ace</groupId> <groupId>edu.umiacs.ace</groupId>
<artifactId>ace-ims-ejb</artifactId> <artifactId>ace-ims-ejb</artifactId>
...@@ -28,32 +37,32 @@ ...@@ -28,32 +37,32 @@
<type>war</type> <type>war</type>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>edu.umiacs.ace</groupId>
<artifactId>ace-ims-server</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>ace-ims</finalName> <finalName>ace-ims</finalName>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-ear-plugin</artifactId> <artifactId>maven-ear-plugin</artifactId>
<configuration> <configuration>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<modules> <modules>
<jarModule> <webModule>
<groupId>edu.umiacs.ace</groupId>
<artifactId>ace-ims-server</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
</jarModule>
<jarModule>
<groupId>edu.umiacs.ace</groupId> <groupId>edu.umiacs.ace</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-ims-war</artifactId>
<includeInApplicationXml>true</includeInApplicationXml> <contextRoot>/ace-ims</contextRoot>
</jarModule> <unpack>true</unpack>
<!-- <ejbModule> </webModule>
<ejbModule>
<groupId>edu.umiacs.ace</groupId> <groupId>edu.umiacs.ace</groupId>
<artifactId>ace-ims-ejb</artifactId> <artifactId>ace-ims-ejb</artifactId>
</ejbModule> </ejbModule>
<webModule>
<groupId>edu.umiacs.ace</groupId>
<artifactId>ace-ims-war</artifactId>
</webModule>-->
</modules> </modules>
<jboss> <jboss>
<version>4</version> <version>4</version>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.0 J2EE Application 1.4//EN" "http://www.sun.com/software/appserver/dtds/sun-application_1_4-0.dtd">
<sun-application/>
...@@ -22,7 +22,7 @@ public class InitializeBean implements InitializeLocal ...@@ -22,7 +22,7 @@ public class InitializeBean implements InitializeLocal
public void development() public void development()
{ {
if ( tokenClassBean.list() == null || tokenClassBean.list().size() == 0 ) if ( tokenClassBean.list() == null || tokenClassBean.list().isEmpty() )
{ {
TokenClass tc = new TokenClass(); TokenClass tc = new TokenClass();
tc.setName("SHA-256"); tc.setName("SHA-256");
......
...@@ -23,6 +23,11 @@ ...@@ -23,6 +23,11 @@
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<version>1.45</version>
</dependency>
<dependency> <dependency>
<groupId>edu.umiacs.ace</groupId> <groupId>edu.umiacs.ace</groupId>
<artifactId>ace-ims-ejb</artifactId> <artifactId>ace-ims-ejb</artifactId>
...@@ -51,6 +56,11 @@ ...@@ -51,6 +56,11 @@
<artifactId>quartz</artifactId> <artifactId>quartz</artifactId>
<version>1.8.6</version> <version>1.8.6</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.5</version>
</dependency>
</dependencies> </dependencies>
......
...@@ -333,4 +333,4 @@ public class ApplicationListener implements ServletContextListener ...@@ -333,4 +333,4 @@ public class ApplicationListener implements ServletContextListener
} }
Log.system("Offline"); Log.system("Offline");
} }
} }
\ No newline at end of file
...@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit; ...@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import javax.ejb.EJB;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.log4j.NDC; import org.apache.log4j.NDC;
...@@ -45,6 +46,8 @@ import org.apache.log4j.NDC; ...@@ -45,6 +46,8 @@ import org.apache.log4j.NDC;
class RoundProcessor extends Thread class RoundProcessor extends Thread
{ {
private static final HashFormatter hashFormatter = new HashFormatter(); private static final HashFormatter hashFormatter = new HashFormatter();
@EJB(name="RoundBean")
private RoundLocal roundBean = private RoundLocal roundBean =
ServiceLocator.getInstance().getLocal(RoundLocal.class); ServiceLocator.getInstance().getLocal(RoundLocal.class);
......
...@@ -19,6 +19,7 @@ import java.util.Map; ...@@ -19,6 +19,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.ejb.EJB;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
...@@ -34,6 +35,8 @@ public final class RoundProcessors ...@@ -34,6 +35,8 @@ public final class RoundProcessors
private Map<TokenClass, RoundProcessor> processors = private Map<TokenClass, RoundProcessor> processors =
new HashMap<TokenClass, RoundProcessor>(); new HashMap<TokenClass, RoundProcessor>();
private ReadWriteLock processorsLock = new ReentrantReadWriteLock(); private ReadWriteLock processorsLock = new ReentrantReadWriteLock();
@EJB(name="TokenStoreBean")
private TokenStoreLocal tokenStoreBean = private TokenStoreLocal tokenStoreBean =
ServiceLocator.getInstance().getLocal(TokenStoreLocal.class); ServiceLocator.getInstance().getLocal(TokenStoreLocal.class);
private TokenPersistenceThread persistenceThread; private TokenPersistenceThread persistenceThread;
......
...@@ -84,34 +84,36 @@ ...@@ -84,34 +84,36 @@
<welcome-file-list> <welcome-file-list>
<welcome-file>index.jsp</welcome-file> <welcome-file>index.jsp</welcome-file>
</welcome-file-list> </welcome-file-list>
<!--
<ejb-local-ref> <ejb-local-ref>
<ejb-ref-name>RoundBean</ejb-ref-name> <ejb-ref-name>RoundBean</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type> <ejb-ref-type>Session</ejb-ref-type>
<local>edu.umiacs.ace.ims.round.RoundLocal</local> <local>edu.umiacs.ace.ims.round.RoundLocal</local>
<ejb-link>ace-ims-ejb.jar#RoundBean</ejb-link> <ejb-link>edu.umiacs.ace_ace-ims-ejb_ejb_1.7.1-SNAPSHOT/RoundBean</ejb-link>
</ejb-local-ref> </ejb-local-ref>
<ejb-local-ref> <ejb-local-ref>
<ejb-ref-name>TokenStoreBean</ejb-ref-name> <ejb-ref-name>TokenStoreBean</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type> <ejb-ref-type>Session</ejb-ref-type>
<local>edu.umiacs.ace.ims.store.TokenStoreLocal</local> <local>edu.umiacs.ace.ims.store.TokenStoreLocal</local>
<ejb-link>ace-ims-ejb.jar#TokenStoreBean</ejb-link> <ejb-link>edu.umiacs.ace_ace-ims-ejb_ejb_1.7.1-SNAPSHOT/TokenStoreBean</ejb-link>
</ejb-local-ref> </ejb-local-ref>
<ejb-local-ref> <ejb-local-ref>
<ejb-ref-name>TokenClassBean</ejb-ref-name> <ejb-ref-name>TokenClassBean</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type> <ejb-ref-type>Session</ejb-ref-type>
<local>edu.umiacs.ace.ims.tokenclass.TokenClassLocal</local> <local>edu.umiacs.ace.ims.tokenclass.TokenClassLocal</local>
<ejb-link>ace-ims-ejb.jar#TokenClassBean</ejb-link> <ejb-link>edu.umiacs.ace_ace-ims-ejb_ejb_1.7.1-SNAPSHOT/TokenClassBean</ejb-link>
</ejb-local-ref> </ejb-local-ref>
<ejb-local-ref> <ejb-local-ref>
<ejb-ref-name>WitnessBean</ejb-ref-name> <ejb-ref-name>WitnessBean</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type> <ejb-ref-type>Session</ejb-ref-type>
<local>edu.umiacs.ace.ims.witness.WitnessLocal</local> <local>edu.umiacs.ace.ims.witness.WitnessLocal</local>
<ejb-link>ace-ims-ejb.jar#WitnessBean</ejb-link> <ejb-link>edu.umiacs.ace_ace-ims-ejb_ejb_1.7.1-SNAPSHOT/WitnessBean</ejb-link>
</ejb-local-ref> </ejb-local-ref>
<ejb-local-ref> <ejb-local-ref>
<ejb-ref-name>MailPublisherBean</ejb-ref-name> <ejb-ref-name>MailPublisherBean</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type> <ejb-ref-type>Session</ejb-ref-type>
<local>edu.umiacs.ace.ims.system.MailPublisherLocal</local> <local>edu.umiacs.ace.ims.system.MailPublisherLocal</local>
<ejb-link>ace-ims-ejb.jar#MailPublisherBean</ejb-link> <ejb-link>edu.umiacs.ace_ace-ims-ejb_ejb_1.7.1-SNAPSHOT/MailPublisherBean</ejb-link>
</ejb-local-ref> </ejb-local-ref>
-->
</web-app> </web-app>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment