Author: jfrederic.clere(a)jboss.com Date: 2011-05-12 12:11:01 -0400 (Thu, 12 May 2011) New Revision: 2783 Added: trunk/build/unix/util/jbosswebtests/cacert.pem trunk/build/unix/util/jbosswebtests/newcert.pem trunk/build/unix/util/jbosswebtests/newkey.pem trunk/build/unix/util/jbosswebtests/node1/ trunk/build/unix/util/jbosswebtests/node1/conf/ trunk/build/unix/util/jbosswebtests/node1/conf/logging.properties Removed: trunk/build/unix/util/jbossweb/cacert.pem trunk/build/unix/util/jbossweb/newcert.pem trunk/build/unix/util/jbossweb/newkey.pem trunk/build/unix/util/jbossweb/node1/conf/logging.properties Modified: trunk/build/unix/util/jbossweb/files.sh trunk/build/unix/util/jbosswebtests/pom.xml trunk/build/unix/util/jbosswebtests/src/main/java/org/jboss/test/JBossWeb.java trunk/build/unix/util/jbosswebtests/src/main/java/org/jboss/test/StartJBossWeb.java Log: Arrange more locations. Deleted: trunk/build/unix/util/jbossweb/cacert.pem =================================================================== --- trunk/build/unix/util/jbossweb/cacert.pem 2011-05-10 09:10:10 UTC (rev 2782) +++ trunk/build/unix/util/jbossweb/cacert.pem 2011-05-12 16:11:01 UTC (rev 2783) @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC3TCCAkagAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJDSDES -MBAGA1UECBMJTmV1Y2hhdGVsMRAwDgYDVQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVq -Ym9zczEOMAwGA1UEAxMFamZjcGMxITAfBgkqhkiG9w0BCQEWEmpmY2xlcmVAcmVk -aGF0LmNvbTAeFw0wODEyMDIxMzU2MzdaFw0xMTEyMDIxMzU2MzdaMHYxCzAJBgNV -BAYTAkNIMRIwEAYDVQQIEwlOZXVjaGF0ZWwxEDAOBgNVBAoTB1JlZCBIYXQxDjAM -BgNVBAsTBWpib3NzMQ4wDAYDVQQDEwVqZmNwYzEhMB8GCSqGSIb3DQEJARYSamZj -bGVyZUByZWRoYXQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBju4V -GAwObduuScxhPHNvBWRbjU1DAiv00fwHh6nELVxwBsyzWOY4pcUBfrr3bNsJP9dd -ZpGHqHA7kroLZxfyXTmF/C58a1HIhhzgS4rtijOFHOh5WLD0HZICPdCR1D1IznXx -oAoMOQ/PeGCfiPVLWzwSqrg/GDW3vhTIRlTrpwIDAQABo3sweTAJBgNVHRMEAjAA -MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd -BgNVHQ4EFgQU3P9xfJgsEC/jPhHgr5Wt3J8iCYAwHwYDVR0jBBgwFoAU3P9xfJgs -EC/jPhHgr5Wt3J8iCYAwDQYJKoZIhvcNAQEFBQADgYEAJoT9AdqxQ/7ezw5sx6Fn -DSJR7DtiXVHB8zChbev3aS36Dym4qiQBXgQ+hUe+AtnMDq3YNN7LGBP/a/eT76zs -CWsKLfZq200wkQE/54fSxLGmapy6DQuh2Xtuw+oEjAlZVBruLMv9gOQ4Dg+DteRp -cSlORuUwHEggjl3PakQc78Q= ------END CERTIFICATE----- Modified: trunk/build/unix/util/jbossweb/files.sh =================================================================== --- trunk/build/unix/util/jbossweb/files.sh 2011-05-10 09:10:10 UTC (rev 2782) +++ trunk/build/unix/util/jbossweb/files.sh 2011-05-12 16:11:01 UTC (rev 2783) @@ -100,18 +100,18 @@ esac export TYPE - mkdir -p src/main/resources/bin/native/${PLATFORM} + mkdir -p src/main/resources/bin/META-INF/lib/${PLATFORM} echo $FILE echo $BASE wget http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuccessfulB... || exit 1 if [ $HTTPFILE != $FILE ]; then mv $HTTPFILE $FILE fi - (cd src/main/resources/bin/native + (cd src/main/resources/bin/META-INF/lib if [ $TYPE = "tar" ]; then - tar zxvf ../../../../../$FILE + tar zxvf ../../../../../../$FILE else - unzip -o ../../../../../$FILE + unzip -o ../../../../../../$FILE fi mv bin/native ${PLATFORM}/${CPU} rm -rf bin Deleted: trunk/build/unix/util/jbossweb/newcert.pem =================================================================== --- trunk/build/unix/util/jbossweb/newcert.pem 2011-05-10 09:10:10 UTC (rev 2782) +++ trunk/build/unix/util/jbossweb/newcert.pem 2011-05-12 16:11:01 UTC (rev 2783) @@ -1,73 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 8 (0x8) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C=CH, ST=Neuchatel, O=Red Hat, OU=jboss, CN=jfcpc/emailAddress=jfclere(a)redhat.com - Validity - Not Before: May 4 07:42:13 2011 GMT - Not After : May 3 07:42:13 2012 GMT - Subject: C=CH, ST=Neuchatel, L=Neuchatel, O=Red Hat, OU=jboss, CN=localhost/emailAddress=jfclere(a)jfclere.org - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:d9:46:dc:a0:e0:b9:b1:2c:c8:83:55:ec:a4:06: - 5b:ee:60:0a:c0:6f:28:4b:4d:97:39:06:5c:3d:b0: - 32:d4:4e:d6:c7:3f:22:54:e2:a7:d9:e2:c7:9c:b9: - b9:bd:1d:66:45:53:7e:3b:25:32:76:79:c9:c1:52: - 91:bb:d3:02:b5:1c:70:a1:a3:e8:75:94:ea:ad:61: - 36:a7:5e:c8:59:c2:7c:94:f5:17:46:6a:65:cc:c9: - 2c:09:49:54:ee:73:60:ec:63:ec:92:56:22:60:fc: - b5:46:ba:7c:ca:d3:f9:85:e5:7e:20:44:b1:4d:5e: - 71:4b:84:07:11:23:ce:0c:70:55:14:f6:74:c6:ce: - 34:18:d0:ae:e9:da:a0:0b:ca:98:0e:19:92:d2:d8: - 4a:90:9a:62:da:90:5f:7a:d9:f7:ff:14:7b:41:6e: - 8d:37:cc:a5:45:c2:18:b9:d9:99:0b:3d:ae:3d:fe: - 9c:6a:25:06:b7:25:41:ad:c3:ac:c7:c7:4f:8c:d1: - 81:2c:bd:f9:e4:7f:26:d3:5c:84:f4:da:2a:1d:0a: - 6a:15:1b:e1:e2:c1:c8:ef:b4:4d:92:9d:b3:3c:c9: - 8f:e0:b3:7e:94:12:c1:24:58:6f:87:38:11:2d:e3: - c8:c6:0f:be:50:0c:de:3a:9e:ff:e9:64:51:65:64: - 6a:db - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - 39:CC:FF:65:7D:6D:F3:2D:6F:88:96:8D:ED:9A:A5:5A:BE:FE:EE:E4 - X509v3 Authority Key Identifier: - keyid:DC:FF:71:7C:98:2C:10:2F:E3:3E:11:E0:AF:95:AD:DC:9F:22:09:80 - - Signature Algorithm: sha1WithRSAEncryption - ae:f3:48:4c:81:6f:5a:af:76:bb:88:85:f7:a7:5b:2e:14:57: - 31:d5:04:cb:4d:97:88:24:bd:87:e4:24:05:10:6a:2b:4d:bd: - 05:84:d7:f4:0a:3b:de:c7:ba:31:a8:22:c8:82:80:19:5f:f3: - 2b:d5:1e:62:20:c3:87:4b:40:b2:f3:78:b4:ef:b3:7b:00:93: - 9e:75:ea:6e:fd:e3:e2:55:6a:23:31:b9:2a:01:71:5f:a1:f2: - f3:a5:0c:21:cd:1d:34:e1:b4:a4:47:ac:7b:2f:30:76:a6:85: - 9c:0e:2b:e2:64:67:f7:14:e6:44:27:52:17:93:8d:e1:0a:41: - 29:1c ------BEGIN CERTIFICATE----- -MIIDezCCAuSgAwIBAgIBCDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJDSDES -MBAGA1UECBMJTmV1Y2hhdGVsMRAwDgYDVQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVq -Ym9zczEOMAwGA1UEAxMFamZjcGMxITAfBgkqhkiG9w0BCQEWEmpmY2xlcmVAcmVk -aGF0LmNvbTAeFw0xMTA1MDQwNzQyMTNaFw0xMjA1MDMwNzQyMTNaMIGPMQswCQYD -VQQGEwJDSDESMBAGA1UECAwJTmV1Y2hhdGVsMRIwEAYDVQQHDAlOZXVjaGF0ZWwx -EDAOBgNVBAoMB1JlZCBIYXQxDjAMBgNVBAsMBWpib3NzMRIwEAYDVQQDDAlsb2Nh -bGhvc3QxIjAgBgkqhkiG9w0BCQEWE2pmY2xlcmVAamZjbGVyZS5vcmcwggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZRtyg4LmxLMiDVeykBlvuYArAbyhL -TZc5Blw9sDLUTtbHPyJU4qfZ4secubm9HWZFU347JTJ2ecnBUpG70wK1HHCho+h1 -lOqtYTanXshZwnyU9RdGamXMySwJSVTuc2DsY+ySViJg/LVGunzK0/mF5X4gRLFN -XnFLhAcRI84McFUU9nTGzjQY0K7p2qALypgOGZLS2EqQmmLakF962ff/FHtBbo03 -zKVFwhi52ZkLPa49/pxqJQa3JUGtw6zHx0+M0YEsvfnkfybTXIT02iodCmoVG+Hi -wcjvtE2SnbM8yY/gs36UEsEkWG+HOBEt48jGD75QDN46nv/pZFFlZGrbAgMBAAGj -ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk -IENlcnRpZmljYXRlMB0GA1UdDgQWBBQ5zP9lfW3zLW+Ilo3tmqVavv7u5DAfBgNV -HSMEGDAWgBTc/3F8mCwQL+M+EeCvla3cnyIJgDANBgkqhkiG9w0BAQUFAAOBgQCu -80hMgW9ar3a7iIX3p1suFFcx1QTLTZeIJL2H5CQFEGorTb0FhNf0Cjvex7oxqCLI -goAZX/Mr1R5iIMOHS0Cy83i077N7AJOedepu/ePiVWojMbkqAXFfofLzpQwhzR00 -4bSkR6x7LzB2poWcDiviZGf3FOZEJ1IXk43hCkEpHA== ------END CERTIFICATE----- Deleted: trunk/build/unix/util/jbossweb/newkey.pem =================================================================== --- trunk/build/unix/util/jbossweb/newkey.pem 2011-05-10 09:10:10 UTC (rev 2782) +++ trunk/build/unix/util/jbossweb/newkey.pem 2011-05-12 16:11:01 UTC (rev 2783) @@ -1,30 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,FC45EBADB04DB592 - -afpHgJoopFeoG7oeI6YVeF0BPIZrmBvnZrQcbhpldYgwns/GIaZVOT1r5iPg0fEY -SpPmeciKf842Um4wcMDMHvG8aOfDmgf/bToSKqtBHowWJBCdsMrp7Z7w2O7kjcUR -CFzdrP9Pm3hUh4sCSwV+WwEZGSY9fbJdGsA2mJzM33m5moX7lT2zgKwLiiUjX5Qn -7GzNmScxxCswQMThcA+q/w6G5rJk7eQlREaR2ji9mrc+hLZSorf9kQ3BLWq17HUc -HFLsciSFlciWuv/YKoBsrniBB5XI6Ys31CQf1smRzh9uhqiiiX2GPXxxwqfP/8LK -PH/NjlwRmB7Ex0cxPAz/QEsnKxgnjFLlTr5gJD7pDYXlWrR/I7wlxgfRaLvBbbmr -+GNVglZLHvnJIfq83jkOFW2ggyM0Zkr3EXAp1u95HaBG43yazi8RPz6kwaiR9+rS -gY7uKnHqqDhOhVNmzrr9DGmetJ0wCeAXrLe4cPz6oie4+wgDZ5t87jFzyUFKY/sU -IoWvuVK0j3ykTuWTHjr9MwA4T47mwT6V98XjSvrejGfcDNp3zv583En9sTqTEeN1 -iXuqxUdJmsGAdlJZqlmOIbAcGfyZw5kAeU58pLueAMoiaN6Ne3+fG8GHYtFncaSP -bQeZFoghTty3/E87f4M1TpBhh2hdVfJ9uizHwGceJrFWERXjp42q1DqPdYmpIWwl -EBXkmWTJ+Nw1GPTYeOgjkkP3elAcI/R/gshJAj0p0vrjuFPoKuy/VnK5DIWHYaxf -9CRibePWEM/NxdZ21CDzevA47+QLjadTTgLoHvuWLKWun3lHJh4oCmUJKsEotPql -uCmkho+QEDfUpeDKlpscZRPyCJDDlyJWhPOpHin7HksehsPSK4xSlGweUMacB0DT -S63gBpCBbpA7Gzj6WrePd8NSgreDTQqa1Io6IJr279jLgZuNLnW1Dsg606bRWWm0 -ieB+G9SgxZ7yrDE0jk82pTJN7c7DsMMSnASA/2rx8QHyvNIVKBmFRGOe7RnyYYU2 -kDG3giW5mVluN65PNNasqwtRo1rOL3TyeMDTzLwFjmT4dLbEPgxOWV27ZeVxESOi -fXZfls2aKHR/5P18pSuQmmB2TSbT3/T8+P//t1OZ9M/VCmBfmOpq0VaVFAV+we8h -y0EWnxLHsNQAi1Zsu33L0Xt5Sev1M/pyz5XBJiBr+JPO9YcM+VFhJuyjMM0MbCWl -aPOUF2uESeqoj1SyHMDrZ6D9lpQk3S+RmmFG+OkAsOejVWGcuIDURwWWHIWyxo89 -9FR7lanvV1K0W6z4+RYc+VQYLI5Ldzph8n7XpVAiqLvhIeHhWBd9o2wIaoHoR2CM -6ej6z0xxuEB7L1YX50KYGDT+mXdUopQiNorShFZlnowUMjIU3ChROEXCcEls0jYf -XC/S5aUoSXF2NLRKvEig94pZUr1moO7GETuFNu/ZYQZJNdgG2OWCEmBNGc/Vk0AI -16iF+QkwQkyLEwBiArTguNkDCpLE9pziW5zDXD8RU3o3vqHfXXluMlZO88MvhUR8 -BxpTFhkqWrxvhzX1M3m8erff3RccHmH8BY6DEc3NshyfUjHRC1RgBQC0vxasjyDk ------END RSA PRIVATE KEY----- Deleted: trunk/build/unix/util/jbossweb/node1/conf/logging.properties =================================================================== --- trunk/build/unix/util/jbossweb/node1/conf/logging.properties 2011-05-10 09:10:10 UTC (rev 2782) +++ trunk/build/unix/util/jbossweb/node1/conf/logging.properties 2011-05-12 16:11:01 UTC (rev 2783) @@ -1,51 +0,0 @@ -handlers = 1catalina.org.jboss.test.FileHandler, 2localhost.org.jboss.test.FileHandler, 3manager.org.jboss.test.FileHandler, 4admin.org.jboss.test.FileHandler, 5host-manager.org.jboss.test.FileHandler, java.util.logging.ConsoleHandler - -.handlers = 1catalina.org.jboss.test.FileHandler, java.util.logging.ConsoleHandler - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -1catalina.org.jboss.test.FileHandler.level = FINE -1catalina.org.jboss.test.FileHandler.directory = ${catalina.base}/logs -1catalina.org.jboss.test.FileHandler.prefix = catalina. - -2localhost.org.jboss.test.FileHandler.level = FINE -2localhost.org.jboss.test.FileHandler.directory = ${catalina.base}/logs -2localhost.org.jboss.test.FileHandler.prefix = localhost. - -3manager.org.jboss.test.FileHandler.level = FINE -3manager.org.jboss.test.FileHandleorg.jboss.test.FileHandlerse}/logs -3manager.org.jboss.test.FileHandler.prefix = manager. - -5host-manager.org.jboss.test.FileHandler.level = FINE -5host-manager.org.jboss.test.FileHandler.directory = ${catalina.base}/logs -5host-manager.org.jboss.test.FileHandler.prefix = host-manager. - -java.util.logging.ConsoleHandler.level = FINE -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.jboss.test.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.jboss.test.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.jboss.test.FileHandler - -# For example, set the com.xyz.foo logger to only log SEVERE -# messages: -#org.apache.catalina.startup.ContextConfig.level = FINE -#org.apache.catalina.startup.HostConfig.level = FINE -#org.apache.catalina.session.ManagerBase.level = FINE -org.apache.catalina.core.AprLifecycleListener.level=ALL -org.apache.catalina.level=ALL -org.jboss.test.level=ALL Copied: trunk/build/unix/util/jbosswebtests/cacert.pem (from rev 2782, trunk/build/unix/util/jbossweb/cacert.pem) =================================================================== --- trunk/build/unix/util/jbosswebtests/cacert.pem (rev 0) +++ trunk/build/unix/util/jbosswebtests/cacert.pem 2011-05-12 16:11:01 UTC (rev 2783) @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC3TCCAkagAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJDSDES +MBAGA1UECBMJTmV1Y2hhdGVsMRAwDgYDVQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVq +Ym9zczEOMAwGA1UEAxMFamZjcGMxITAfBgkqhkiG9w0BCQEWEmpmY2xlcmVAcmVk +aGF0LmNvbTAeFw0wODEyMDIxMzU2MzdaFw0xMTEyMDIxMzU2MzdaMHYxCzAJBgNV +BAYTAkNIMRIwEAYDVQQIEwlOZXVjaGF0ZWwxEDAOBgNVBAoTB1JlZCBIYXQxDjAM +BgNVBAsTBWpib3NzMQ4wDAYDVQQDEwVqZmNwYzEhMB8GCSqGSIb3DQEJARYSamZj +bGVyZUByZWRoYXQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBju4V +GAwObduuScxhPHNvBWRbjU1DAiv00fwHh6nELVxwBsyzWOY4pcUBfrr3bNsJP9dd +ZpGHqHA7kroLZxfyXTmF/C58a1HIhhzgS4rtijOFHOh5WLD0HZICPdCR1D1IznXx +oAoMOQ/PeGCfiPVLWzwSqrg/GDW3vhTIRlTrpwIDAQABo3sweTAJBgNVHRMEAjAA +MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd +BgNVHQ4EFgQU3P9xfJgsEC/jPhHgr5Wt3J8iCYAwHwYDVR0jBBgwFoAU3P9xfJgs +EC/jPhHgr5Wt3J8iCYAwDQYJKoZIhvcNAQEFBQADgYEAJoT9AdqxQ/7ezw5sx6Fn +DSJR7DtiXVHB8zChbev3aS36Dym4qiQBXgQ+hUe+AtnMDq3YNN7LGBP/a/eT76zs +CWsKLfZq200wkQE/54fSxLGmapy6DQuh2Xtuw+oEjAlZVBruLMv9gOQ4Dg+DteRp +cSlORuUwHEggjl3PakQc78Q= +-----END CERTIFICATE----- Copied: trunk/build/unix/util/jbosswebtests/newcert.pem (from rev 2782, trunk/build/unix/util/jbossweb/newcert.pem) =================================================================== --- trunk/build/unix/util/jbosswebtests/newcert.pem (rev 0) +++ trunk/build/unix/util/jbosswebtests/newcert.pem 2011-05-12 16:11:01 UTC (rev 2783) @@ -0,0 +1,73 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 8 (0x8) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=CH, ST=Neuchatel, O=Red Hat, OU=jboss, CN=jfcpc/emailAddress=jfclere(a)redhat.com + Validity + Not Before: May 4 07:42:13 2011 GMT + Not After : May 3 07:42:13 2012 GMT + Subject: C=CH, ST=Neuchatel, L=Neuchatel, O=Red Hat, OU=jboss, CN=localhost/emailAddress=jfclere(a)jfclere.org + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (2048 bit) + Modulus: + 00:d9:46:dc:a0:e0:b9:b1:2c:c8:83:55:ec:a4:06: + 5b:ee:60:0a:c0:6f:28:4b:4d:97:39:06:5c:3d:b0: + 32:d4:4e:d6:c7:3f:22:54:e2:a7:d9:e2:c7:9c:b9: + b9:bd:1d:66:45:53:7e:3b:25:32:76:79:c9:c1:52: + 91:bb:d3:02:b5:1c:70:a1:a3:e8:75:94:ea:ad:61: + 36:a7:5e:c8:59:c2:7c:94:f5:17:46:6a:65:cc:c9: + 2c:09:49:54:ee:73:60:ec:63:ec:92:56:22:60:fc: + b5:46:ba:7c:ca:d3:f9:85:e5:7e:20:44:b1:4d:5e: + 71:4b:84:07:11:23:ce:0c:70:55:14:f6:74:c6:ce: + 34:18:d0:ae:e9:da:a0:0b:ca:98:0e:19:92:d2:d8: + 4a:90:9a:62:da:90:5f:7a:d9:f7:ff:14:7b:41:6e: + 8d:37:cc:a5:45:c2:18:b9:d9:99:0b:3d:ae:3d:fe: + 9c:6a:25:06:b7:25:41:ad:c3:ac:c7:c7:4f:8c:d1: + 81:2c:bd:f9:e4:7f:26:d3:5c:84:f4:da:2a:1d:0a: + 6a:15:1b:e1:e2:c1:c8:ef:b4:4d:92:9d:b3:3c:c9: + 8f:e0:b3:7e:94:12:c1:24:58:6f:87:38:11:2d:e3: + c8:c6:0f:be:50:0c:de:3a:9e:ff:e9:64:51:65:64: + 6a:db + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + Netscape Comment: + OpenSSL Generated Certificate + X509v3 Subject Key Identifier: + 39:CC:FF:65:7D:6D:F3:2D:6F:88:96:8D:ED:9A:A5:5A:BE:FE:EE:E4 + X509v3 Authority Key Identifier: + keyid:DC:FF:71:7C:98:2C:10:2F:E3:3E:11:E0:AF:95:AD:DC:9F:22:09:80 + + Signature Algorithm: sha1WithRSAEncryption + ae:f3:48:4c:81:6f:5a:af:76:bb:88:85:f7:a7:5b:2e:14:57: + 31:d5:04:cb:4d:97:88:24:bd:87:e4:24:05:10:6a:2b:4d:bd: + 05:84:d7:f4:0a:3b:de:c7:ba:31:a8:22:c8:82:80:19:5f:f3: + 2b:d5:1e:62:20:c3:87:4b:40:b2:f3:78:b4:ef:b3:7b:00:93: + 9e:75:ea:6e:fd:e3:e2:55:6a:23:31:b9:2a:01:71:5f:a1:f2: + f3:a5:0c:21:cd:1d:34:e1:b4:a4:47:ac:7b:2f:30:76:a6:85: + 9c:0e:2b:e2:64:67:f7:14:e6:44:27:52:17:93:8d:e1:0a:41: + 29:1c +-----BEGIN CERTIFICATE----- +MIIDezCCAuSgAwIBAgIBCDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJDSDES +MBAGA1UECBMJTmV1Y2hhdGVsMRAwDgYDVQQKEwdSZWQgSGF0MQ4wDAYDVQQLEwVq +Ym9zczEOMAwGA1UEAxMFamZjcGMxITAfBgkqhkiG9w0BCQEWEmpmY2xlcmVAcmVk +aGF0LmNvbTAeFw0xMTA1MDQwNzQyMTNaFw0xMjA1MDMwNzQyMTNaMIGPMQswCQYD +VQQGEwJDSDESMBAGA1UECAwJTmV1Y2hhdGVsMRIwEAYDVQQHDAlOZXVjaGF0ZWwx +EDAOBgNVBAoMB1JlZCBIYXQxDjAMBgNVBAsMBWpib3NzMRIwEAYDVQQDDAlsb2Nh +bGhvc3QxIjAgBgkqhkiG9w0BCQEWE2pmY2xlcmVAamZjbGVyZS5vcmcwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZRtyg4LmxLMiDVeykBlvuYArAbyhL +TZc5Blw9sDLUTtbHPyJU4qfZ4secubm9HWZFU347JTJ2ecnBUpG70wK1HHCho+h1 +lOqtYTanXshZwnyU9RdGamXMySwJSVTuc2DsY+ySViJg/LVGunzK0/mF5X4gRLFN +XnFLhAcRI84McFUU9nTGzjQY0K7p2qALypgOGZLS2EqQmmLakF962ff/FHtBbo03 +zKVFwhi52ZkLPa49/pxqJQa3JUGtw6zHx0+M0YEsvfnkfybTXIT02iodCmoVG+Hi +wcjvtE2SnbM8yY/gs36UEsEkWG+HOBEt48jGD75QDN46nv/pZFFlZGrbAgMBAAGj +ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk +IENlcnRpZmljYXRlMB0GA1UdDgQWBBQ5zP9lfW3zLW+Ilo3tmqVavv7u5DAfBgNV +HSMEGDAWgBTc/3F8mCwQL+M+EeCvla3cnyIJgDANBgkqhkiG9w0BAQUFAAOBgQCu +80hMgW9ar3a7iIX3p1suFFcx1QTLTZeIJL2H5CQFEGorTb0FhNf0Cjvex7oxqCLI +goAZX/Mr1R5iIMOHS0Cy83i077N7AJOedepu/ePiVWojMbkqAXFfofLzpQwhzR00 +4bSkR6x7LzB2poWcDiviZGf3FOZEJ1IXk43hCkEpHA== +-----END CERTIFICATE----- Copied: trunk/build/unix/util/jbosswebtests/newkey.pem (from rev 2782, trunk/build/unix/util/jbossweb/newkey.pem) =================================================================== --- trunk/build/unix/util/jbosswebtests/newkey.pem (rev 0) +++ trunk/build/unix/util/jbosswebtests/newkey.pem 2011-05-12 16:11:01 UTC (rev 2783) @@ -0,0 +1,30 @@ +-----BEGIN RSA PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: DES-EDE3-CBC,FC45EBADB04DB592 + +afpHgJoopFeoG7oeI6YVeF0BPIZrmBvnZrQcbhpldYgwns/GIaZVOT1r5iPg0fEY +SpPmeciKf842Um4wcMDMHvG8aOfDmgf/bToSKqtBHowWJBCdsMrp7Z7w2O7kjcUR +CFzdrP9Pm3hUh4sCSwV+WwEZGSY9fbJdGsA2mJzM33m5moX7lT2zgKwLiiUjX5Qn +7GzNmScxxCswQMThcA+q/w6G5rJk7eQlREaR2ji9mrc+hLZSorf9kQ3BLWq17HUc +HFLsciSFlciWuv/YKoBsrniBB5XI6Ys31CQf1smRzh9uhqiiiX2GPXxxwqfP/8LK +PH/NjlwRmB7Ex0cxPAz/QEsnKxgnjFLlTr5gJD7pDYXlWrR/I7wlxgfRaLvBbbmr ++GNVglZLHvnJIfq83jkOFW2ggyM0Zkr3EXAp1u95HaBG43yazi8RPz6kwaiR9+rS +gY7uKnHqqDhOhVNmzrr9DGmetJ0wCeAXrLe4cPz6oie4+wgDZ5t87jFzyUFKY/sU +IoWvuVK0j3ykTuWTHjr9MwA4T47mwT6V98XjSvrejGfcDNp3zv583En9sTqTEeN1 +iXuqxUdJmsGAdlJZqlmOIbAcGfyZw5kAeU58pLueAMoiaN6Ne3+fG8GHYtFncaSP +bQeZFoghTty3/E87f4M1TpBhh2hdVfJ9uizHwGceJrFWERXjp42q1DqPdYmpIWwl +EBXkmWTJ+Nw1GPTYeOgjkkP3elAcI/R/gshJAj0p0vrjuFPoKuy/VnK5DIWHYaxf +9CRibePWEM/NxdZ21CDzevA47+QLjadTTgLoHvuWLKWun3lHJh4oCmUJKsEotPql +uCmkho+QEDfUpeDKlpscZRPyCJDDlyJWhPOpHin7HksehsPSK4xSlGweUMacB0DT +S63gBpCBbpA7Gzj6WrePd8NSgreDTQqa1Io6IJr279jLgZuNLnW1Dsg606bRWWm0 +ieB+G9SgxZ7yrDE0jk82pTJN7c7DsMMSnASA/2rx8QHyvNIVKBmFRGOe7RnyYYU2 +kDG3giW5mVluN65PNNasqwtRo1rOL3TyeMDTzLwFjmT4dLbEPgxOWV27ZeVxESOi +fXZfls2aKHR/5P18pSuQmmB2TSbT3/T8+P//t1OZ9M/VCmBfmOpq0VaVFAV+we8h +y0EWnxLHsNQAi1Zsu33L0Xt5Sev1M/pyz5XBJiBr+JPO9YcM+VFhJuyjMM0MbCWl +aPOUF2uESeqoj1SyHMDrZ6D9lpQk3S+RmmFG+OkAsOejVWGcuIDURwWWHIWyxo89 +9FR7lanvV1K0W6z4+RYc+VQYLI5Ldzph8n7XpVAiqLvhIeHhWBd9o2wIaoHoR2CM +6ej6z0xxuEB7L1YX50KYGDT+mXdUopQiNorShFZlnowUMjIU3ChROEXCcEls0jYf +XC/S5aUoSXF2NLRKvEig94pZUr1moO7GETuFNu/ZYQZJNdgG2OWCEmBNGc/Vk0AI +16iF+QkwQkyLEwBiArTguNkDCpLE9pziW5zDXD8RU3o3vqHfXXluMlZO88MvhUR8 +BxpTFhkqWrxvhzX1M3m8erff3RccHmH8BY6DEc3NshyfUjHRC1RgBQC0vxasjyDk +-----END RSA PRIVATE KEY----- Copied: trunk/build/unix/util/jbosswebtests/node1/conf/logging.properties (from rev 2782, trunk/build/unix/util/jbossweb/node1/conf/logging.properties) =================================================================== --- trunk/build/unix/util/jbosswebtests/node1/conf/logging.properties (rev 0) +++ trunk/build/unix/util/jbosswebtests/node1/conf/logging.properties 2011-05-12 16:11:01 UTC (rev 2783) @@ -0,0 +1,51 @@ +handlers = 1catalina.org.jboss.test.FileHandler, 2localhost.org.jboss.test.FileHandler, 3manager.org.jboss.test.FileHandler, 4admin.org.jboss.test.FileHandler, 5host-manager.org.jboss.test.FileHandler, java.util.logging.ConsoleHandler + +.handlers = 1catalina.org.jboss.test.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.jboss.test.FileHandler.level = FINE +1catalina.org.jboss.test.FileHandler.directory = ${catalina.base}/logs +1catalina.org.jboss.test.FileHandler.prefix = catalina. + +2localhost.org.jboss.test.FileHandler.level = FINE +2localhost.org.jboss.test.FileHandler.directory = ${catalina.base}/logs +2localhost.org.jboss.test.FileHandler.prefix = localhost. + +3manager.org.jboss.test.FileHandler.level = FINE +3manager.org.jboss.test.FileHandleorg.jboss.test.FileHandlerse}/logs +3manager.org.jboss.test.FileHandler.prefix = manager. + +5host-manager.org.jboss.test.FileHandler.level = FINE +5host-manager.org.jboss.test.FileHandler.directory = ${catalina.base}/logs +5host-manager.org.jboss.test.FileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + + +############################################################ +# Facility specific properties. +# Provides extra control for each logger. +############################################################ + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.jboss.test.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.jboss.test.FileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.jboss.test.FileHandler + +# For example, set the com.xyz.foo logger to only log SEVERE +# messages: +#org.apache.catalina.startup.ContextConfig.level = FINE +#org.apache.catalina.startup.HostConfig.level = FINE +#org.apache.catalina.session.ManagerBase.level = FINE +org.apache.catalina.core.AprLifecycleListener.level=ALL +org.apache.catalina.level=ALL +org.jboss.test.level=ALL Modified: trunk/build/unix/util/jbosswebtests/pom.xml =================================================================== --- trunk/build/unix/util/jbosswebtests/pom.xml 2011-05-10 09:10:10 UTC (rev 2782) +++ trunk/build/unix/util/jbosswebtests/pom.xml 2011-05-12 16:11:01 UTC (rev 2783) @@ -34,7 +34,8 @@ <properties> <version.junit>4.8.1</version.junit> - <version.org.jboss.web>7.0.0.CR1</version.org.jboss.web> + <version.org.jboss.web>7.0.0.CR2</version.org.jboss.web> + <version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.0_spec>1.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.0_spec> <!-- <version.org.jboss.web>2.1.11.GA</version.org.jboss.web> --> @@ -60,6 +61,46 @@ <enableAssertions>false</enableAssertions> </configuration> </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <phase>test</phase> + <configuration> + <tasks> + <!-- extract the native build to test it --> + + <echo>"native jar: ${org.jboss.as:jbossweb-native:jar}"</echo> + + <unjar src="${org.jboss.as:jbossweb-native:jar}" dest="node1" /> + + <!-- Start jbossweb (embedded) --> + <java dir="node1" classname="org.jboss.test.StartJBossWeb" + spawn="true" fork="yes"> + <arg line="${line}"/> + <jvmarg line="-Djava.util.logging.config.file=node1/conf/logging.properties" /> + <jvmarg line="-Djava.util.logging.manager=org.jboss.test.ClassLoaderLogManager"/> + <classpath refid="maven.test.classpath"/> + </java> + + <!-- Test it --> + <delete file="index.html"/> + <exec executable="wget"> + <arg value="--no-check-certificate"/> + <arg value="https://localhost:8009/index.html"/> + </exec> + <available file="index.html" property="exist"/> + <fail unless="exist" message="Can't get test file"/> + + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -84,13 +125,23 @@ <version>${version.org.jboss.as.jbossweb-native}</version> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <version>${version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.0_spec}</version> + <scope>test</scope> + </dependency> + </dependencies> <repositories> <repository> <id>jboss-public-repository-group</id> <name>JBoss Public Repository Group</name> + <!-- <url>http://repository.jboss.org/nexus/content/groups/public/</url> + --> + <url>https://repository.jboss.org/nexus/content/groups/staging/</url... <layout>default</layout> <releases> <enabled>true</enabled> Modified: trunk/build/unix/util/jbosswebtests/src/main/java/org/jboss/test/JBossWeb.java =================================================================== --- trunk/build/unix/util/jbosswebtests/src/main/java/org/jboss/test/JBossWeb.java 2011-05-10 09:10:10 UTC (rev 2782) +++ trunk/build/unix/util/jbosswebtests/src/main/java/org/jboss/test/JBossWeb.java 2011-05-12 16:11:01 UTC (rev 2783) @@ -62,12 +62,13 @@ this.route = route; //Create an Engine - Engine baseEngine = createEngine(); + StandardEngine baseEngine = (StandardEngine) createEngine(); baseEngine.setName(host + "Engine" + route); baseEngine.setDefaultHost(host); baseEngine.setJvmRoute(route); baseEngine.setRealm(null); + baseEngine.setBaseDir(route); // Create node1/webapps/ROOT and index.html File fd = new File ( route + "/webapps/" + webapp); Modified: trunk/build/unix/util/jbosswebtests/src/main/java/org/jboss/test/StartJBossWeb.java =================================================================== --- trunk/build/unix/util/jbosswebtests/src/main/java/org/jboss/test/StartJBossWeb.java 2011-05-10 09:10:10 UTC (rev 2782) +++ trunk/build/unix/util/jbosswebtests/src/main/java/org/jboss/test/StartJBossWeb.java 2011-05-12 16:11:01 UTC (rev 2783) @@ -81,16 +81,14 @@ AprLifecycleListener apr = new AprLifecycleListener(); server.addLifecycleListener(apr); - final Connector connector = new Connector("HTTP/1.1"); - connector.setScheme("https"); - connector.setPort(port); - service.addConnector(connector); server.addService(service); // server.addLifecycleListener(apr); server.init(); server.start(); + + service.addConnector(port, "https"); } catch(IOException ex) { ex.printStackTrace();