Changeset 2500

Timestamp:

10/06/08 16:22:45 (3 months ago)

Author:

dsanders

Message:

Modified so that war files are deployed and undeployed independent of starting up and shutting down glassfish.

Location:

trunk/otis/src/org/bandit/otis

Files:

• server/EntityHandler.java (modified) (2 diffs)
• server/OtisServlet.java (modified) (1 diff)
• test/OTISRunner.java (modified) (6 diffs)
• test/junit/AllTests.java (modified) (2 diffs)
• test/junit/AuthSessionBaseTest.java (modified) (2 diffs)
• test/junit/DeployOTIS.java (added)
• test/junit/DeployOTISAnd.java (added)
• test/junit/DeployOTISOr.java (added)
• test/junit/GlassfishShutdown.java (added)
• test/junit/GlassfishStartup.java (added)
• test/junit/OTISShutdown.java (deleted)
• test/junit/OTISStartup.java (deleted)
• test/junit/OTISStartupAnd.java (deleted)
• test/junit/OTISStartupOr.java (deleted)
• test/junit/SampleDeployment.java (modified) (2 diffs)
• test/junit/UndeployOTIS.java (added)

trunk/otis/src/org/bandit/otis/server/EntityHandler.java

@@ -553 +553 @@
                 try
                 {
+                        m_log.debug( "Calling getEntitites");
                         entityIter = localAuthSession.getEntities( null, (attrList != null) ? attrList.iterator() : null);
+                        m_log.debug( "Start iterating through results");
+                        int     iAttrCnt = 0;
                         while (entityIter.hasNext())
                         {
@@ -566 +569 @@
                                 
                                 List    entityAttrList;
+                                iAttrCnt++;
+                                m_log.debug( "Getting attr #" + iAttrCnt);
                                 if ((entityAttrList = queryAttributes( strSessionID, "Entity='" + strEntityID + "'", entity, attrList, responseMap)) != null)
                                 {
                                         entityMap.put( Constants.TEMPLATE_ATTR_LIST, entityAttrList);
                                 }
+                                m_log.debug( "Got attr #" + iAttrCnt);
                                 entityList.add( entityMap);
                         }
+                        m_log.debug( "Done iterating through results");
                 }
                 catch (IdASException e)

trunk/otis/src/org/bandit/otis/server/OtisServlet.java

@@ -1163 +1163 @@
                                 StringWriter    strOut = new StringWriter( 1024);
                                 Template                        template = m_templateCfg.getTemplate( strTemplateFile);
-                                
+
+                                m_log.debug( "Processing template " + strTemplateFile + " ....");                               
                                 template.process( responseMap, strOut);
+                                m_log.debug( "Done processing template " + strTemplateFile);
                                 
                                 // Now output over HTTP.

trunk/otis/src/org/bandit/otis/test/OTISRunner.java

@@ -20 +20 @@
         private static int port = 9997;
         private static Integer sync = new Integer( 0);
+        
+        public static void startGlassfish()
+        {
+                try
+                {
+                        synchronized( sync)
+                        {
+                                glassfish = new AppServer(port);
+                        }
+                }
+                catch (Throwable e)
+                {
+                        System.out.println( e.getMessage());
+                        e.printStackTrace();
+                }
+        }
+        
+        public static void stopGlassfish()
+        {
+                try
+                {
+                        synchronized( sync)
+                        {
+                                glassfish.stop();
+                                glassfish = null;
+                        }
+                }
+                catch (Throwable e)
+                {
+                        System.out.println( e.getMessage());
+                        e.printStackTrace();
+                }
+        }
         
         private static void copyFile(
@@ -89 +122 @@
         }
                 
-        public static void start(
+        public static void deployWar(
                 String  strServerConfigFile,
                 String  strServerLocalConfigFile) throws IOException {
@@ -97 +130 @@
                         {
                                 otisUseCount++;
-                                System.out.println( "start, count = " + otisUseCount);
-                                if (otisUseCount == 1) {
-                                        System.out.println( "Allocating glassfish");
-                                        glassfish = new AppServer(port);
+                                if (otisUseCount == 1)
+                                {
+                                        if (glassfish == null)
+                                        {
+                                                glassfish = new AppServer(port);
+                                        }
                                         otis = glassfish.deploy(new File("build/otis-test.war"));
                                         byte [] copyBuf = new byte [2048];
-                                        if (strServerConfigFile != null) {
+                                        if (strServerConfigFile != null)
+                                        {
                                           // Copy over otis-config.server.xml
                                           copyFile( "otis-config.server.xml", strServerConfigFile, copyBuf);
                                         }
-                                        if (strServerLocalConfigFile != null) {
+                                        if (strServerLocalConfigFile != null)
+                                        {
                                           // Copy over otis-config.client.local.xml
                                           copyFile( "otis-config.client.local.xml", strServerLocalConfigFile, copyBuf);
@@ -129 +166 @@
         }
         
-        public static void stop() {
+        public static void undeployWar()
+        {
                 try
                 {
@@ -135 +173 @@
                         {
                                 otisUseCount--;
-                                System.out.println( "stop, count = " + otisUseCount);
-                                if (otisUseCount == 0) {
+                                if (otisUseCount == 0)
+                                {
                                         otis.undeploy();
-                                        glassfish.stop();
-                                        glassfish = null;
-                                        System.out.println( "UNDEPLOY");
                                 }
                         }
@@ -150 +185 @@
                 }
         }
-        
 }
+

trunk/otis/src/org/bandit/otis/test/junit/AllTests.java

@@ -10 +10 @@
         {
                 TestSuite suite = new TestSuite("Test for org.bandit.otis.test");
+                
                 //$JUnit-BEGIN$
-                // OTISStartup - use around tests that don't have to manipulate server startup
-                suite.addTestSuite(OTISStartup.class);
+                suite.addTestSuite(GlassfishStartup.class);
+                // Deploy the default OTIS war file for the following tests
+                suite.addTestSuite(DeployOTIS.class);
                 suite.addTestSuite(UriBuilderTest.class);
                 suite.addTestSuite(AttributeTest.class);
@@ -21 +23 @@
                 suite.addTestSuite(PropertiesTest.class);
 //              suite.addTestSuite(IDMSessionTest.class);
-                // OTISShutdown will force OTIS server to go down
-                suite.addTestSuite(OTISShutdown.class);
+                // Undeploy the default OTIS war file
+                suite.addTestSuite(UndeployOTIS.class);
                 
-                // These tests do their own thing with OTIS server - different config.
-/*              Commented out for now because the startup/shutdown of the OTIS server has problems.
-                suite.addTestSuite(OTISStartupAnd.class);
+                // These tests slightly modify the OTIS war configuration
+                suite.addTestSuite(DeployOTISAnd.class);
                 suite.addTestSuite(CustomAuthMethodTestAnd.class);
-                suite.addTestSuite(OTISShutdown.class);
+                suite.addTestSuite(UndeployOTIS.class);
                 
-                suite.addTestSuite(OTISStartupOr.class);
+                suite.addTestSuite(DeployOTISOr.class);
                 suite.addTestSuite(CustomAuthMethodTestOr.class);
-                suite.addTestSuite(OTISShutdown.class);
-*/
+                suite.addTestSuite(UndeployOTIS.class);
+                
+                suite.addTestSuite(GlassfishShutdown.class);
                 
                 //$JUnit-END$

trunk/otis/src/org/bandit/otis/test/junit/AuthSessionBaseTest.java

@@ -55 +55 @@
         {
                 try {
-                        OTISRunner.start( strServerConfigFile, strLocalConfigFile);
+                        OTISRunner.deployWar( strServerConfigFile, strLocalConfigFile);
                 } catch (IOException e) {
                         m_log.error(e);
@@ -89 +89 @@
         protected void tearDown()
         {
-                OTISRunner.stop();
+                OTISRunner.undeployWar();
                 // ldapServer.shutdownTool();
                 ldapServer ls = ldapSrv.getServer();

trunk/otis/src/org/bandit/otis/test/junit/SampleDeployment.java

@@ -16 +16 @@
                 super.setUp();
 
-                OTISRunner.start( null, null);
+                OTISRunner.deployWar( null, null);
                 
                 String[] args =
@@ -36 +36 @@
         protected void tearDown()
         {
-                OTISRunner.stop();
+                OTISRunner.undeployWar();
                 // ldapServer.shutdownTool();
                 ldapServer ls = ldapSrv.getServer();