Menu
▾
▴
jboss-cvs-commits — CVS commits for JBoss
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
| 2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
| 2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
| 2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
| 2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Scott S. <sco...@jb...> - 2006-07-06 17:03:05
|
User: starksm
Date: 06/07/06 13:03:02
Modified: src/main/org/jboss/security/auth/login Tag: Branch_4_0
XMLLoginConfigImpl.java
Log:
Make the unmarshal(String, ObjectModelFactory, Object) call explicit to avoid amiguous resolution issues.
Revision Changes Path
No revision
No revision
1.13.2.6 +3 -2 jbosssx/src/main/org/jboss/security/auth/login/XMLLoginConfigImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: XMLLoginConfigImpl.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/auth/login/XMLLoginConfigImpl.java,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.6
diff -u -b -r1.13.2.5 -r1.13.2.6
--- XMLLoginConfigImpl.java 29 Oct 2005 05:06:34 -0000 1.13.2.5
+++ XMLLoginConfigImpl.java 6 Jul 2006 17:03:02 -0000 1.13.2.6
@@ -57,7 +57,7 @@
@see javax.security.auth.login.Configuration
@author Sco...@jb...
- @version $Revision: 1.13.2.5 $
+ @version $Revision: 1.13.2.6 $
*/
public class XMLLoginConfigImpl extends Configuration
{
@@ -319,7 +319,8 @@
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance()
.newUnmarshaller();
unmarshaller.mapFactoryToNamespace(uomf, "http://www.jboss.org/j2ee/schemas/XMLLoginModule");
- PolicyConfig config = (PolicyConfig) unmarshaller.unmarshal(xmlReader, lcomf, null);
+ Object root = null;
+ PolicyConfig config = (PolicyConfig) unmarshaller.unmarshal(xmlReader, lcomf, root);
configNames.addAll(config.getConfigNames());
appConfigs.copy(config);
}
|
|
From: Clebert S. <csu...@jb...> - 2006-07-06 17:00:36
|
User: csuconic
Date: 06/07/06 13:00:34
Modified: java/src/productionProfiler/org/jboss/profiler/production/interceptors
JDBCInterceptor.java
Log:
adding missing implementation
Revision Changes Path
1.2 +12 -0 jboss-profiler/java/src/productionProfiler/org/jboss/profiler/production/interceptors/JDBCInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JDBCInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/src/productionProfiler/org/jboss/profiler/production/interceptors/JDBCInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- JDBCInterceptor.java 23 Jun 2006 20:34:21 -0000 1.1
+++ JDBCInterceptor.java 6 Jul 2006 17:00:34 -0000 1.2
@@ -66,5 +66,17 @@
public void failedPrepare(String query, SQLException e) {
ThreadController.popFailure(query);
}
+ public void beforeCursor(String query) {
+ // TODO Auto-generated method stub
+
+ }
+ public void afterCursor(String query) {
+ // TODO Auto-generated method stub
+
+ }
+ public void failedCursor(String query, SQLException e) {
+ // TODO Auto-generated method stub
+
+ }
}
}
|
|
From: Manik S. <msu...@jb...> - 2006-07-06 16:57:09
|
User: msurtani
Date: 06/07/06 12:57:07
Added: tests/functional/org/jboss/cache/transaction
AbortionTest.java NotifyingTransactionManager.java
Log:
JBCACHE-688 and JBCCAHE-682
Revision Changes Path
1.2 +228 -0 JBossCache/tests/functional/org/jboss/cache/transaction/AbortionTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbortionTest.java
===================================================================
RCS file: AbortionTest.java
diff -N AbortionTest.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ AbortionTest.java 6 Jul 2006 16:57:07 -0000 1.2
@@ -0,0 +1,228 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.cache.transaction;
+
+import junit.framework.TestCase;
+import org.jboss.cache.TreeCache;
+import org.jboss.cache.interceptors.OrderedSynchronizationHandler;
+import org.jboss.cache.misc.TestingUtil;
+import org.jgroups.JChannel;
+import org.jgroups.blocks.RpcDispatcher;
+
+import javax.transaction.RollbackException;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
+/**
+ * @author <a href="mailto:ma...@jb...">Manik Surtani (ma...@jb...)</a>
+ */
+public class AbortionTest extends TestCase
+{
+ private MyTC cache1, cache2, cache3;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ System.out.println("********* START: SET UP *************");
+ cache1 = initCache(false);
+ TestingUtil.sleepThread(1500); // to ensure cache1 is the coordinator
+ cache2 = initCache(false);
+ cache3 = initCache(true);
+ System.out.println("********* END: SET UP *************");
+ }
+
+
+ protected void tearDown() throws Exception
+ {
+ System.out.println("********* START: TEAR DOWN *************");
+ destroyCache(cache3);
+ destroyCache(cache2);
+ destroyCache(cache1);
+ cache1 = null;
+ cache2 = null;
+ cache3 = null;
+ super.tearDown();
+ System.out.println("********* END: TEAR DOWN *************");
+ }
+
+ private MyTC initCache(boolean notifying) throws Exception
+ {
+ MyTC c = new MyTC();
+ c.setCacheMode("REPL_SYNC");
+ c.setClusterProperties( getJGroupsStack() );
+ c.setFetchStateOnStartup(false);
+ c.setFetchInMemoryState(false);
+ if (!notifying)
+ {
+ c.setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
+ }
+ else
+ {
+ c.setTransactionManagerLookupClass("org.jboss.cache.transaction.NotifyingTransactionManager");
+ }
+ c.startService();
+ return c;
+ }
+
+ // we need a 'special' stack that does not attempt redelivery since we kill a channel midway during a tx in this test.
+ private String getJGroupsStack()
+ {
+// return "UDP(mcast_addr=224.0.0.36;mcast_port=55566;ip_ttl=32;" +
+// "mcast_send_buf_size=150000;mcast_recv_buf_size=80000):" +
+// "PING(timeout=10;num_initial_members=1):" +
+// "pbcast.NAKACK(gc_lag=50;max_xmit_size=8192;retransmit_timeout=10):" +
+// "UNICAST(timeout=600):" +
+// "FRAG(frag_size=8192;down_thread=false;up_thread=false):" +
+// "pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;" +
+// "shun=false;print_local_addr=true):" +
+// "pbcast.STATE_TRANSFER";
+ return JChannel.DEFAULT_PROTOCOL_STACK;
+ }
+
+ private void destroyCache(MyTC c)
+ {
+ if (c != null)
+ {
+ c.stopService();
+ c.destroyService();
+ }
+ }
+
+ public void testSyncCaches() throws Exception
+ {
+ performTest(false, false);
+ }
+
+ public void testSyncCachesSyncCommitRollback() throws Exception
+ {
+ performTest(true, false);
+ }
+
+ /**
+ * Note that this tests a *remote* beforeCompletion abort - which is a part of the calling instance's afterCompletion.
+ *
+ * @throws Exception
+ */
+ public void testAbortBeforeCompletion() throws Exception
+ {
+ performTest(true, true);
+ }
+
+ private void performTest(boolean syncCommitRollback, boolean abortBeforeCompletion) throws Exception
+ {
+ cache1.setSyncCommitPhase(syncCommitRollback);
+ cache1.setSyncRollbackPhase(syncCommitRollback);
+ cache2.setSyncCommitPhase(syncCommitRollback);
+ cache2.setSyncRollbackPhase(syncCommitRollback);
+ cache3.setSyncCommitPhase(syncCommitRollback);
+ cache3.setSyncRollbackPhase(syncCommitRollback);
+
+ TransactionManager mgr1 = cache1.getTransactionManager();
+ TransactionManager mgr2 = cache2.getTransactionManager();
+ NotifyingTransactionManager mgr3 = (NotifyingTransactionManager) cache3.getTransactionManager();
+
+ assertSame(mgr1, mgr2);
+ assertNotSame(mgr1, mgr3);
+ assertNotSame(mgr2, mgr3);
+
+ assertTrue(mgr1 instanceof DummyTransactionManager);
+ assertTrue(mgr2 instanceof DummyTransactionManager);
+ assertTrue(mgr3 instanceof NotifyingTransactionManager);
+
+
+ cache1.put("/test", "key", "value");
+
+ assertEquals("value", cache1.get("/test", "key"));
+ assertEquals("value", cache2.get("/test", "key"));
+ assertEquals("value", cache3.get("/test", "key"));
+
+ // replicates
+ final boolean fAbortBeforeCompletion = abortBeforeCompletion;
+ mgr3.notification = new NotifyingTransactionManager.Notification()
+ {
+ public void notify(Transaction tx) throws SystemException, RollbackException
+ {
+ final Transaction finalTx = tx;
+ System.out.println("Notify called.");
+ // add an aborting sync handler.
+ Synchronization abort = new Synchronization()
+ {
+
+ Transaction t = finalTx;
+
+ public void beforeCompletion()
+ {
+ if (fAbortBeforeCompletion)
+ {
+ cache3.myChannel.close();
+ System.out.println("Returning from abort.beforeCompletion");
+ try
+ {
+ finalTx.setRollbackOnly();
+ }
+ catch (SystemException e)
+ {
+ throw new RuntimeException("Unable to set rollback", e);
+ }
+ throw new RuntimeException("Dummy exception");
+ }
+ }
+
+ public void afterCompletion(int i)
+ {
+ if (!fAbortBeforeCompletion)
+ {
+ cache3.myChannel.close();
+ System.out.println("Returning from abort.afterCompletion");
+ throw new RuntimeException("Dummy exception");
+ }
+ }
+ };
+
+ OrderedSynchronizationHandler osh = OrderedSynchronizationHandler.getInstance(tx);
+ osh.registerAtHead(abort);
+ System.out.println("Added sync handler.");
+ }
+ };
+
+ mgr1.begin();
+ Transaction tx = mgr1.getTransaction();
+ cache1.put("/test", "key", "value2");
+ tx.commit();
+
+ TestingUtil.sleepThread(5000);
+
+ // only test cache1 and cache2. Assume cache3 has crashed out.
+ assertEquals(0, cache1.getNumberOfLocksHeld());
+ assertEquals(0, cache2.getNumberOfLocksHeld());
+ assertEquals("put in transaction should NOT have been rolled back", "value2", cache1.get("/test", "key"));
+ assertEquals("put in transaction should NOT have been rolled back", "value2", cache2.get("/test", "key"));
+
+ }
+
+
+ public static class MyTC extends TreeCache
+ {
+ JChannel myChannel;
+ RpcDispatcher myDispatcher;
+
+ public MyTC() throws Exception
+ {
+ super();
+ }
+
+ public void startService() throws Exception
+ {
+ super.startService();
+ myChannel = channel;
+ myDispatcher = disp;
+ }
+ }
+
+}
1.2 +58 -0 JBossCache/tests/functional/org/jboss/cache/transaction/NotifyingTransactionManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NotifyingTransactionManager.java
===================================================================
RCS file: NotifyingTransactionManager.java
diff -N NotifyingTransactionManager.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ NotifyingTransactionManager.java 6 Jul 2006 16:57:07 -0000 1.2
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.cache.transaction;
+
+import org.jboss.cache.TransactionManagerLookup;
+
+import javax.transaction.NotSupportedException;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.RollbackException;
+
+/**
+ * //TODO: MANIK: Javadoc this class
+ *
+ * @author <a href="mailto:ma...@jb...">Manik Surtani (ma...@jb...)</a>
+ */
+public class NotifyingTransactionManager extends DummyTransactionManager implements TransactionManagerLookup
+{
+ public NotifyingTransactionManager()
+ {
+ super();
+ }
+
+ Notification notification;
+
+ public void begin() throws SystemException, NotSupportedException
+ {
+ super.begin();
+ try
+ {
+ System.out.println("Calling notification.notify()");
+ notification.notify(getTransaction());
+ }
+ catch (RollbackException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public TransactionManager getTransactionManager() throws Exception
+ {
+ return this;
+ }
+
+ public interface Notification
+ {
+ public void notify(Transaction tx) throws SystemException, RollbackException;
+ }
+
+}
+
+
+
|
|
From: Manik S. <msu...@jb...> - 2006-07-06 16:57:09
|
User: msurtani
Date: 06/07/06 12:57:07
Modified: src/org/jboss/cache/interceptors TxInterceptor.java
Log:
JBCACHE-688 and JBCCAHE-682
Revision Changes Path
1.49 +4 -3 JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TxInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- TxInterceptor.java 8 Jun 2006 22:00:35 -0000 1.48
+++ TxInterceptor.java 6 Jul 2006 16:57:07 -0000 1.49
@@ -703,14 +703,15 @@
}
catch (Throwable e)
{
- log.error("Commit failed, rolling back.", e);
+ log.error("Commit failed. Issuing a commit on the local tx to clear stale locks.", e);
try
{
- tx.setRollbackOnly();
+ tx.commit();
}
catch (Exception e2)
{
- log.error("Unable to roll back transaction", e2);
+ log.error("Unable to re-run commit again to clear locks", e2);
+ throw new RuntimeException(e2);
}
throw new RuntimeException("Commit failed, marking tx to be rolled back.", e);
}
|
|
From: Manik S. <msu...@jb...> - 2006-07-06 16:56:33
|
User: msurtani
Date: 06/07/06 12:56:31
Modified: tests/functional/org/jboss/cache/transaction Tag:
Branch_JBossCache_1_4_0 AbortionTest.java
Log:
CLeaned up tests for JBCACHE-668 and JBCACHE-682
Revision Changes Path
No revision
No revision
1.1.4.4 +36 -11 JBossCache/tests/functional/org/jboss/cache/transaction/Attic/AbortionTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbortionTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/Attic/AbortionTest.java,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -b -r1.1.4.3 -r1.1.4.4
--- AbortionTest.java 6 Jul 2006 14:33:01 -0000 1.1.4.3
+++ AbortionTest.java 6 Jul 2006 16:56:31 -0000 1.1.4.4
@@ -11,6 +11,7 @@
import org.jboss.cache.interceptors.OrderedSynchronizationHandler;
import org.jboss.cache.misc.TestingUtil;
import org.jgroups.JChannel;
+import org.jgroups.blocks.RpcDispatcher;
import javax.transaction.RollbackException;
import javax.transaction.Synchronization;
@@ -23,32 +24,40 @@
*/
public class AbortionTest extends TestCase
{
- private TreeCache cache1, cache2, cache3;
+ private MyTC cache1, cache2, cache3;
protected void setUp() throws Exception
{
+ super.setUp();
+ System.out.println("********* START: SET UP *************");
cache1 = initCache(false);
TestingUtil.sleepThread(1500); // to ensure cache1 is the coordinator
cache2 = initCache(false);
cache3 = initCache(true);
+ System.out.println("********* END: SET UP *************");
}
protected void tearDown() throws Exception
{
System.out.println("********* START: TEAR DOWN *************");
- // start cache3's channel again so we can cleanly shut it down
-// ((MyTC) cache3).myChannel.connect("");
-// destroyCache(cache3);
+ destroyCache(cache3);
destroyCache(cache2);
destroyCache(cache1);
+ cache1 = null;
+ cache2 = null;
+ cache3 = null;
+ super.tearDown();
System.out.println("********* END: TEAR DOWN *************");
}
- private TreeCache initCache(boolean notifying) throws Exception
+ private MyTC initCache(boolean notifying) throws Exception
{
- TreeCache c = new MyTC();
+ MyTC c = new MyTC();
c.setCacheMode("REPL_SYNC");
+ c.setClusterProperties( getJGroupsStack() );
+ c.setFetchStateOnStartup(false);
+ c.setFetchInMemoryState(false);
if (!notifying)
{
c.setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
@@ -61,11 +70,27 @@
return c;
}
- private void destroyCache(TreeCache c)
+ // we need a 'special' stack that does not attempt redelivery since we kill a channel midway during a tx in this test.
+ private String getJGroupsStack()
+ {
+// return "UDP(mcast_addr=224.0.0.36;mcast_port=55566;ip_ttl=32;" +
+// "mcast_send_buf_size=150000;mcast_recv_buf_size=80000):" +
+// "PING(timeout=10;num_initial_members=1):" +
+// "pbcast.NAKACK(gc_lag=50;max_xmit_size=8192;retransmit_timeout=10):" +
+// "UNICAST(timeout=600):" +
+// "FRAG(frag_size=8192;down_thread=false;up_thread=false):" +
+// "pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;" +
+// "shun=false;print_local_addr=true):" +
+// "pbcast.STATE_TRANSFER";
+ return JChannel.DEFAULT_PROTOCOL_STACK;
+ }
+
+ private void destroyCache(MyTC c)
{
if (c != null)
{
c.stopService();
+ c.destroyService();
}
}
@@ -133,10 +158,9 @@
public void beforeCompletion()
{
- System.out.println("In abort.beforeCompletion. Cache3 is " + cache3 + " and myChannel is " + ((MyTC) cache3).myChannel);
if (fAbortBeforeCompletion)
{
- ((MyTC) cache3).myChannel.close();
+ cache3.myChannel.close();
System.out.println("Returning from abort.beforeCompletion");
try
{
@@ -152,10 +176,9 @@
public void afterCompletion(int i)
{
- System.out.println("In abort.afterCompletion. Cache3 is " + cache3 + " and myChannel is " + ((MyTC) cache3).myChannel);
if (!fAbortBeforeCompletion)
{
- ((MyTC) cache3).myChannel.close();
+ cache3.myChannel.close();
System.out.println("Returning from abort.afterCompletion");
throw new RuntimeException("Dummy exception");
}
@@ -187,6 +210,7 @@
public static class MyTC extends TreeCache
{
JChannel myChannel;
+ RpcDispatcher myDispatcher;
public MyTC() throws Exception
{
@@ -197,6 +221,7 @@
{
super.startService();
myChannel = channel;
+ myDispatcher = disp;
}
}
|
|
From: Marshall C. <mcu...@jb...> - 2006-07-06 16:50:31
|
User: mculpepper
Date: 06/07/06 12:50:28
Modified: core/features/org.jboss.ide.eclipse.feature/sourceTemplatePlugin
build.properties
Log:
attempting to make source compilation work
Revision Changes Path
1.5 +1 -1 jbosside/core/features/org.jboss.ide.eclipse.feature/sourceTemplatePlugin/build.properties
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.properties
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/features/org.jboss.ide.eclipse.feature/sourceTemplatePlugin/build.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- build.properties 1 Feb 2006 05:16:36 -0000 1.4
+++ build.properties 6 Jul 2006 16:50:28 -0000 1.5
@@ -3,4 +3,4 @@
License.txt,\
src/*/**,\
META-INF/
-sourcePlugin=true
\ No newline at end of file
+sourcePlugin = true
\ No newline at end of file
|
|
From: Marshall C. <mcu...@jb...> - 2006-07-06 16:50:31
|
User: mculpepper
Date: 06/07/06 12:50:28
Removed: core/features/org.jboss.ide.eclipse.feature/sourceTemplateFeature
feature.xml
Log:
attempting to make source compilation work
|
|
From: Galder Z. <gal...@jb...> - 2006-07-06 16:50:10
|
User: gzamarreno
Date: 06/07/06 12:50:08
Modified: docs/faq/en master.xml
Log:
[JBCACHE-678] faq docbook updated to include Troubleshooting section and link.
Revision Changes Path
1.35 +13 -0 JBossCache/docs/faq/en/master.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: master.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/docs/faq/en/master.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- master.xml 24 May 2006 10:00:39 -0000 1.34
+++ master.xml 6 Jul 2006 16:50:08 -0000 1.35
@@ -1733,5 +1733,18 @@
</qandadiv>
+
+ <qandadiv>
+ <title>Troubleshooting</title>
+ <qandaentry>
+ <question>
+ <para>I am having problems getting JBoss Cache to work, where can I get information on troubleshooting?</para>
+ </question>
+ <answer>
+ <para>Troubleshooting section can be found in the following <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCacheTroubleshooting">wiki link</ulink>
+ </para>
+ </answer>
+ </qandaentry>
+ </qandadiv>
</qandaset>
</article>
|
|
From: Roy R. <ru...@jb...> - 2006-07-06 16:48:09
|
User: russo
Date: 06/07/06 12:48:08
Modified: referenceGuide/en master.xml
Log:
JBPORTAL-848 - remove empty security chapter.
Revision Changes Path
1.31 +2 -2 jboss-portal-docs/referenceGuide/en/master.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: master.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal-docs/referenceGuide/en/master.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- master.xml 6 Jul 2006 16:38:50 -0000 1.30
+++ master.xml 6 Jul 2006 16:48:08 -0000 1.31
@@ -17,7 +17,7 @@
<!ENTITY themeandlayouts SYSTEM "modules/themeandlayouts.xml">
<!ENTITY clustering SYSTEM "modules/clustering.xml">
<!ENTITY wsrp SYSTEM "modules/wsrp.xml">
- <!ENTITY security SYSTEM "modules/security.xml">
+ <!--<!ENTITY security SYSTEM "modules/security.xml">-->
<!ENTITY troubleshooting SYSTEM "modules/troubleshooting.xml">
]>
<book lang="en">
@@ -56,7 +56,7 @@
<!-- IPC &ipc;-->
<!-- clustering configuration --> &clustering;
<!-- WSRP --> &wsrp;
- <!-- security administration --> &security;
+ <!-- security administration &security; -->
<!-- CMS --> &CMS;
<!-- theme/layout api --> &themeandlayouts;
<!-- troubleshooting FAQ--> &troubleshooting;
|
|
From: Galder Z. <gal...@jb...> - 2006-07-06 16:43:13
|
User: gzamarreno
Date: 06/07/06 12:43:11
Modified: docs/faq/en Tag: Branch_JBossCache_1_4_0 master.xml
Log:
[JBCACHE-678] faq docbook updated to include Troubleshooting section and link.
Revision Changes Path
No revision
No revision
1.34.2.2 +13 -0 JBossCache/docs/faq/en/master.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: master.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/docs/faq/en/master.xml,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -b -r1.34.2.1 -r1.34.2.2
--- master.xml 23 Jun 2006 06:55:20 -0000 1.34.2.1
+++ master.xml 6 Jul 2006 16:43:11 -0000 1.34.2.2
@@ -1728,5 +1728,18 @@
</qandadiv>
+
+ <qandadiv>
+ <title>Troubleshooting</title>
+ <qandaentry>
+ <question>
+ <para>I am having problems getting JBoss Cache to work, where can I get information on troubleshooting?</para>
+ </question>
+ <answer>
+ <para>Troubleshooting section can be found in the following <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCacheTroubleshooting">wiki link</ulink>
+ </para>
+ </answer>
+ </qandaentry>
+ </qandadiv>
</qandaset>
</article>
|
|
From: Roy R. <ru...@jb...> - 2006-07-06 16:38:55
|
User: russo
Date: 06/07/06 12:38:50
Modified: referenceGuide/en/modules xmldescriptors.xml
Log:
JBPORTAL-934 - updated desc and created samples on pswap.
Revision Changes Path
1.23 +174 -117 jboss-portal-docs/referenceGuide/en/modules/xmldescriptors.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: xmldescriptors.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal-docs/referenceGuide/en/modules/xmldescriptors.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- xmldescriptors.xml 30 Jun 2006 20:22:56 -0000 1.22
+++ xmldescriptors.xml 6 Jul 2006 16:38:50 -0000 1.23
@@ -463,51 +463,53 @@
<title>Descriptor Examples</title>
<sect2>
<title>Defining a new portal page.</title>
- <para>To illustrate our example, we have made available a portlet that you can download
+ <para>This sample application and descriptor will create a new page, named
+ <emphasis>MyPage</emphasis>
+ in your portal. To illustrate our example, we have made available a portlet with a page descriptor that you
+ can download
here:
<ulink
- url="http://labs.jboss.com/file-access/default/members/portletswap/downloads/portlets/samples/HelloWorldPortlet.zip"
- >HelloWorld Portlet</ulink>
+ url="http://anonsvn.jboss.org/repos/portletswap/portlets/bundles/HelloWorldPortalPage.zip"
+ >HelloWorld Page</ulink>
.
</para>
- <para>For our example we make available
+ <note>
+ To use this example, simply extract the zip, and deploy the
+ <emphasis>helloworldportalpage.war</emphasis>
+ where your portal is running (hot-deployment supported).
+ </note>
+ <para>Our sample includes a descriptor to define this new portal page,
<emphasis>helloworld-object.xml</emphasis>
- located
- under
- <emphasis>helloworldportlet.war/WEB-INF/</emphasis>
+ , located under
+ <emphasis>helloworldportalpage.war/WEB-INF/</emphasis>
, and it looks like this:
- <programlisting>
- <![CDATA[
- <?xml version="1.0" encoding="UTF-8"?>
- <deployments>
+ <programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<properties/>
<page>
- <page-name>Hello World</page-name>
- <properties/>
+ <page-name>MyPage</page-name>
<window>
- <window-name>HelloWorldPortletWindow</window-name>
- <instance-ref>HelloWorldPortletInstance</instance-ref>
+ <window-name>HelloWorldPortletPageWindow</window-name>
+ <instance-ref>HelloWorldPortletPageInstance</instance-ref>
<region>center</region>
<height>0</height>
</window>
+ <security-constraint>
+ <policy-permission>
+ <unchecked/>
+ <action-name>viewrecursive</action-name>
+ </policy-permission>
+ </security-constraint>
</page>
</deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-name>HelloWorldPortletInstance</instance-name>
- <component-ref>helloworld.HelloWorldPortlet</component-ref>
- </instance>
- </deployment>
- </deployments>
- ]]>
+</deployments>]]>
</programlisting>
</para>
<para>A deployment file can be composed of a set of <deployments>. In our
- example file, above, we are defining a page, placing the HelloWorldPortlet as a window
+ example file, above, we are defining a page, placing the portlet as a window
on that page, and creating an instance of that portlet. You can then use the Management
Portlet (bundled with JBoss Portal) to modify the instances of this portlet, reposition
it, and so on...</para>
@@ -585,6 +587,52 @@
the application followed by the name of the portlet, as defined in the
<emphasis>portlet.xml</emphasis>
</listitem>
+ <listitem>
+ <para>
+ <programlisting><![CDATA[<security-constraint>
+ <policy-permission>
+ <unchecked/>
+ <action-name>viewrecursive</action-name>
+ </policy-permission>
+</security-constraint>]]></programlisting>
+ The security contraint portion is worth taking a look at, in an isolated fashion. It allows you to
+ secure a specific page/portal based on a user's role.
+ </para>
+ <para>
+ <emphasis role="bold">Role definition:</emphasis>
+ You must define a role that this security constraint will apply to. Possible values are:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold"><unchecked/></emphasis>
+ Anyone can view this page.
+ </listitem>
+ <listitem>
+ <emphasis role="bold"><role-name>SOMEROLE</role-name></emphasis>
+ Access to this page is limited to the defined role.
+ </listitem>
+ </itemizedlist>
+ <emphasis role="bold">Access Rights:</emphasis>
+ You must define the access rights given to the role defined. Possible values are:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold">view</emphasis>
+ Users can view the page.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">viewrecursive</emphasis>
+ Users can view the page and child pages.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">personalize</emphasis>
+ Users are able to view AND personalize the page.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">personalizerecursive</emphasis>
+ Users are able to view AND personalize the page AND its child pages.
+ </listitem>
+ </itemizedlist>
+ </para>
+ </listitem>
</itemizedlist>
</para>
</sect2>
@@ -593,7 +641,7 @@
<para>To illustrate our example, we have made available a portlet that you can download
here:
<ulink
- url="http://labs.jboss.com/file-access/default/members/portletswap/downloads/portlets/samples/HelloPortal.zip"
+ url="http://anonsvn.jboss.org/repos/portletswap/portlets/bundles/HelloWorldPortal.zip"
>HelloPortal</ulink>
.
</para>
@@ -601,12 +649,11 @@
<emphasis>helloworld-object.xml</emphasis>
located
under
- <emphasis>helloworldportlet.war/WEB-INF/</emphasis>
+ <emphasis>helloworldportal.war/WEB-INF/</emphasis>
, and it looks like this:
- <programlisting>
- <![CDATA[
- <?xml version="1.0" encoding="UTF-8"?>
- <deployments>
+ <programlisting><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
<deployment>
<parent-ref/>
<if-exists>overwrite</if-exists>
@@ -652,12 +699,24 @@
<page-name>default</page-name>
<properties/>
<window>
- <window-name>HelloWorldPortletWindow</window-name>
- <instance-ref>HelloWorldPortletInstance</instance-ref>
+ <window-name>MyPortletWindow</window-name>
+ <instance-ref>MyPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
</window>
+ <security-constraint>
+ <policy-permission>
+ <unchecked/>
+ <action-name>viewrecursive</action-name>
+ </policy-permission>
+ </security-constraint>
</page>
+ <security-constraint>
+ <policy-permission>
+ <unchecked/>
+ <action-name>personalizerecursive</action-name>
+ </policy-permission>
+ </security-constraint>
</portal>
</deployment>
<deployment>
@@ -666,22 +725,20 @@
<page>
<page-name>foobar</page-name>
<window>
- <window-name>HelloWorldPortletWindow</window-name>
- <instance-ref>HelloWorldPortletInstance</instance-ref>
+ <window-name>MyPortletWindow</window-name>
+ <instance-ref>MyPortletInstance</instance-ref>
<region>center</region>
<height>0</height>
</window>
+ <security-constraint>
+ <policy-permission>
+ <unchecked/>
+ <action-name>viewrecursive</action-name>
+ </policy-permission>
+ </security-constraint>
</page>
</deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-name>HelloWorldPortletInstance</instance-name>
- <component-ref>helloworld.HelloWorldPortlet</component-ref>
- </instance>
- </deployment>
- </deployments>
- ]]>
+</deployments>]]>
</programlisting>
</para>
<para>This example, when deployed, will register a new portal instance named
|
|
From: Roy R. <ru...@jb...> - 2006-07-06 16:38:53
|
User: russo
Date: 06/07/06 12:38:50
Modified: referenceGuide/en master.xml
Log:
JBPORTAL-934 - updated desc and created samples on pswap.
Revision Changes Path
1.30 +2 -2 jboss-portal-docs/referenceGuide/en/master.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: master.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal-docs/referenceGuide/en/master.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- master.xml 21 Jun 2006 22:13:54 -0000 1.29
+++ master.xml 6 Jul 2006 16:38:50 -0000 1.30
@@ -12,7 +12,7 @@
<!ENTITY tutorials SYSTEM "modules/tutorials.xml">
<!ENTITY xmldescriptors SYSTEM "modules/xmldescriptors.xml">
<!ENTITY urls SYSTEM "modules/urls.xml">
- <!ENTITY ipc SYSTEM "modules/ipc.xml">
+ <!--<!ENTITY ipc SYSTEM "modules/ipc.xml">-->
<!ENTITY CMS SYSTEM "modules/cmsPortlet.xml">
<!ENTITY themeandlayouts SYSTEM "modules/themeandlayouts.xml">
<!ENTITY clustering SYSTEM "modules/clustering.xml">
@@ -53,7 +53,7 @@
<!-- portlet tutorials --> &tutorials;
<!-- deployment desc --> &xmldescriptors;
<!-- understanding urls --> &urls;
- <!-- IPC --> &ipc;
+ <!-- IPC &ipc;-->
<!-- clustering configuration --> &clustering;
<!-- WSRP --> &wsrp;
<!-- security administration --> &security;
|
|
From: Clebert S. <csu...@jb...> - 2006-07-06 16:08:04
|
User: csuconic
Date: 06/07/06 12:07:59
Added: tests/org/jboss/serial/regression/jbser82 TestTwoJVM.java
TestTwoJVM_2_Test.java TestTwoJVM_1_Test.java
Log:
JBSER-82 - fix
Revision Changes Path
1.1 date: 2006/07/06 16:07:58; author: csuconic; state: Exp;jboss-serialization/tests/org/jboss/serial/regression/jbser82/TestTwoJVM.java
Index: TestTwoJVM.java
===================================================================
package org.jboss.serial.regression.jbser82;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import org.jboss.serial.io.JBossObjectInputStream;
import org.jboss.serial.io.JBossObjectOutputStream;
import junit.framework.TestCase;
public class TestTwoJVM extends TestCase
{
protected Object read(String fileName) throws Exception
{
System.out.println("De-serializing...");
FileInputStream fis = new FileInputStream(fileName);
JBossObjectInputStream ois = new JBossObjectInputStream(fis);
Object data = ois.readObject();
ois.close();
fis.close();
return data;
// no exception... unit test passes
}
protected void writeContainer(String fileName, Object container) throws Exception
{
System.out.println("Serializing...");
FileOutputStream fos = new FileOutputStream(fileName);
JBossObjectOutputStream oos = new JBossObjectOutputStream(fos);
oos.writeObject(container);
oos.close();
fos.close();
// no exception... unit test passes
}
}
1.1 date: 2006/07/06 16:07:58; author: csuconic; state: Exp;jboss-serialization/tests/org/jboss/serial/regression/jbser82/TestTwoJVM_2_Test.java
Index: TestTwoJVM_2_Test.java
===================================================================
package org.jboss.serial.regression.jbser82;
public class TestTwoJVM_2_Test extends TestTwoJVM
{
public void testRead() throws Exception
{
read("tst82.dat");
}
}
1.1 date: 2006/07/06 16:07:58; author: csuconic; state: Exp;jboss-serialization/tests/org/jboss/serial/regression/jbser82/TestTwoJVM_1_Test.java
Index: TestTwoJVM_1_Test.java
===================================================================
package org.jboss.serial.regression.jbser82;
public class TestTwoJVM_1_Test extends TestTwoJVM{
public void testWrite() throws Exception
{
Object obj = new byte[0][];
writeContainer("tst82.dat",obj);
}
}
|
|
From: Clebert S. <csu...@jb...> - 2006-07-06 16:08:04
|
User: csuconic Date: 06/07/06 12:07:57 Log: Directory /cvsroot/jboss/jboss-serialization/tests/org/jboss/serial/regression/jbser82 added to the repository |
|
From: Clebert S. <csu...@jb...> - 2006-07-06 16:08:04
|
User: csuconic
Date: 06/07/06 12:07:59
Modified: src/org/jboss/serial/classmetamodel
ClassMetamodelFactory.java
Log:
JBSER-82 - fix
Revision Changes Path
1.46 +4 -4 jboss-serialization/src/org/jboss/serial/classmetamodel/ClassMetamodelFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClassMetamodelFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-serialization/src/org/jboss/serial/classmetamodel/ClassMetamodelFactory.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- ClassMetamodelFactory.java 18 May 2006 16:17:44 -0000 1.45
+++ ClassMetamodelFactory.java 6 Jul 2006 16:07:59 -0000 1.46
@@ -28,7 +28,6 @@
import java.io.ObjectStreamField;
import java.io.Serializable;
import java.lang.ref.WeakReference;
-import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -42,7 +41,7 @@
import org.jboss.serial.util.PartitionedWeakHashMap;
/**
- * $Id: ClassMetamodelFactory.java,v 1.45 2006/05/18 16:17:44 csuconic Exp $
+ * $Id: ClassMetamodelFactory.java,v 1.46 2006/07/06 16:07:59 csuconic Exp $
* @author clebert suconic
*/
public class ClassMetamodelFactory implements ClassMetaConsts
@@ -280,7 +279,8 @@
private static Class resolveArrayByName(String clazzName,ClassResolver resolver,ClassLoader loader) throws ClassNotFoundException
{
- String realClassName = clazzName;
+ return Class.forName(clazzName,true,loader);
+ /*String realClassName = clazzName;
if (realClassName.endsWith(";"))
{
realClassName = realClassName.substring(0,realClassName.length()-1);
@@ -303,7 +303,7 @@
arrayDeep[i]=1;
}
- return Array.newInstance(typeArray, arrayDeep).getClass();
+ return Array.newInstance(typeArray, arrayDeep).getClass(); */
}
private static ClassMetaData loadClassMetaDataArray(String clazzName, ClassResolver resolver, ClassLoader loader, boolean checkSerializable) throws IOException, ClassNotFoundException
|
|
From: Rajesh R. <raj...@jb...> - 2006-07-06 15:58:46
|
User: rrajasekaran
Date: 06/07/06 11:58:45
Modified: etc/cruisecontrol/scripts build-jboss-portal.xml
cruisecontrol.properties
Log:
Updated jboss versions
Revision Changes Path
1.27 +3 -3 tools/etc/cruisecontrol/scripts/build-jboss-portal.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build-jboss-portal.xml
===================================================================
RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/scripts/build-jboss-portal.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- build-jboss-portal.xml 30 Jun 2006 20:10:30 -0000 1.26
+++ build-jboss-portal.xml 6 Jul 2006 15:58:44 -0000 1.27
@@ -49,15 +49,15 @@
<param name="jboss.version.info" value="4_0_x"/>
</antcall>
<antcall target="runtests">
- <param name="jboss.home.dir" value="../../jboss-4.0.4RC1"/>
- <param name="jboss.version.info" value="4_0_4RC1"/>
+ <param name="jboss.home.dir" value="../../jboss-4.0.4.GA"/>
+ <param name="jboss.version.info" value="4_0_4_GA"/>
</antcall>
<antcall target="runtests">
<param name="jboss.home.dir" value="../../jboss-4.0.3SP1"/>
<param name="jboss.version.info" value="4_0_3SP1"/>
</antcall>
<antcall target="runtests">
- <param name="jboss.home.dir" value="../checkout/jboss-builds/jboss-head/jboss-5.0.0.Alpha"/>
+ <param name="jboss.home.dir" value="../checkout/jboss-builds/jboss-head/jboss-5.0.0.Beta"/>
<param name="jboss.version.info" value="HEAD"/>
</antcall>
</target>
1.3 +1 -1 tools/etc/cruisecontrol/scripts/cruisecontrol.properties
(In the diff below, changes in quantity of whitespace are not shown.)
Index: cruisecontrol.properties
===================================================================
RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/scripts/cruisecontrol.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cruisecontrol.properties 30 Jun 2006 20:11:47 -0000 1.2
+++ cruisecontrol.properties 6 Jul 2006 15:58:44 -0000 1.3
@@ -1,5 +1,5 @@
-jboss-head=/home/cruisecontrol/work/checkout/jboss-builds/jboss-head/jboss-5.0.0.Alpha
+jboss-head=/home/cruisecontrol/work/checkout/jboss-builds/jboss-head/jboss-5.0.0.Beta
jboss-40x-14=/home/cruisecontrol/work/checkout/jboss-builds/jboss-4.0.x/jboss-4.0.5.CR1
jboss-40x-15=/home/cruisecontrol/work/checkout/jboss-builds/jboss-4.0.x/jboss-4.0.5.CR1-ejb3
|
|
From: Ruel L. <rue...@jb...> - 2006-07-06 15:52:59
|
User: rloehr
Date: 06/07/06 11:52:56
Modified: jboss build.xml
Log:
replace slow unjarring procedure with zipfileset
Revision Changes Path
1.207 +4 -7 jboss/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss/build.xml,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -b -r1.206 -r1.207
--- build.xml 22 Jun 2006 19:42:30 -0000 1.206
+++ build.xml 6 Jul 2006 15:52:56 -0000 1.207
@@ -14,7 +14,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.206 2006/06/22 19:42:30 rloehr Exp $ -->
+<!-- $Id: build.xml,v 1.207 2006/07/06 15:52:56 rloehr Exp $ -->
<project default="main" name="JBoss/Server">
@@ -495,9 +495,6 @@
</fileset>
</jar>
- <!-- Unjar getopt better packaging (but slower builds) -->
- <mkdir dir="${build.gen}/getopt"/>
- <unjar src="${gnu.getopt.lib}/getopt.jar" dest="${build.gen}/getopt"/>
<!-- Build shutdown.jar -->
<jar jarfile="${build.lib}/shutdown.jar" manifest="${build.etc}/manifest/shutdown.mf">
@@ -510,9 +507,9 @@
</fileset>
<!-- Include getopt -->
- <fileset dir="${build.gen}/getopt">
+ <zipfileset src="${gnu.getopt.lib}/getopt.jar">
<include name="**"/>
- </fileset>
+ </zipfileset>
</jar>
<!-- uuid-key-generator.sar -->
|
|
From: Ruel L. <rue...@jb...> - 2006-07-06 15:46:23
|
User: rloehr
Date: 06/07/06 11:46:19
Modified: jboss-system build.xml
Log:
replace slow unjarring procedure with zipfileset
Revision Changes Path
1.56 +23 -49 jboss-system/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-system/build.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- build.xml 22 Jun 2006 19:42:17 -0000 1.55
+++ build.xml 6 Jul 2006 15:46:19 -0000 1.56
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.55 2006/06/22 19:42:17 rloehr Exp $ -->
+<!-- $Id: build.xml,v 1.56 2006/07/06 15:46:19 rloehr Exp $ -->
<project default="main" name="JBoss/System">
@@ -133,15 +133,16 @@
<!-- Archives -->
<!-- ================================================================== -->
- <target name="bypasslog4jboot" depends="init">
- <uptodate property="log4jboot-bypass.on" targetfile="${build.lib}/log4j-boot.jar">
- <srcfiles dir="${apache.log4j.lib}" includes="log4j.jar"/>
- </uptodate>
- </target>
- <target name="log4jboot" depends="bypasslog4jboot" unless="log4jboot-bypass.on">
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars" >
+
+ <!-- Server and client jars -->
+ <call target="_default:server-client-jars"/>
<!--
| Build log4j-boot.jar This is a minimal subset of the log4j
@@ -149,44 +150,17 @@
| loading log4j classes that depend on other features like
| JMS, JDBC, JavaMail, etc.
-->
- <mkdir dir="${build.gen}/log4j"/>
- <unjar src="${apache.log4j.lib}/log4j.jar" dest="${build.gen}/log4j"/>
+
<jar jarfile="${build.lib}/log4j-boot.jar">
- <fileset dir="${build.gen}/log4j">
+ <zipfileset src="${apache.log4j.lib}/log4j.jar">
<include name="org/apache/log4j/*"/>
<include name="org/apache/log4j/config/*"/>
<include name="org/apache/log4j/helpers/*"/>
<include name="org/apache/log4j/or/*"/>
<include name="org/apache/log4j/spi/*"/>
- </fileset>
+ </zipfileset>
</jar>
- </target>
-
- <target name="bypassgetopt" depends="init">
-
- <uptodate property="getopt-bypass.on" targetfile="${build.lib}/run.jar">
- <srcfiles dir="${gnu.getopt.lib}" includes="getopt.jar"/>
- </uptodate>
-
- </target>
-
- <target name="getopt" depends="bypassgetopt" unless="getopt-bypass.on">
-
- <!-- Unjar getopt better packaging (but slower builds) -->
- <mkdir dir="${build.gen}/getopt"/>
- <unjar src="${gnu.getopt.lib}/getopt.jar" dest="${build.gen}/getopt"/>
-
- </target>
-
- <!--
- | Build all jar files.
- -->
- <target name="module-jars" depends="log4jboot, getopt">
-
- <!-- Server and client jars -->
- <call target="_default:server-client-jars"/>
-
<!-- -->
<jar jarfile="${build.lib}/jboss-system.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}" />
@@ -226,9 +200,9 @@
</fileset>
<!-- Include getopt -->
- <fileset dir="${build.gen}/getopt">
+ <zipfileset src="${gnu.getopt.lib}/getopt.jar">
<include name="**"/>
- </fileset>
+ </zipfileset>
</jar>
<!--
|
|
From: Luc T. <lt...@jb...> - 2006-07-06 15:31:58
|
User: ltexier
Date: 06/07/06 11:31:54
Modified: src/main/org/jboss/mq/pm/jdbc2 Tag:
JBoss_4_0_3_SP1_JBAS3259 PersistenceManager.java
Log:
[JBAS-3259] - backport fix from JBAS-3370
Revision Changes Path
No revision
No revision
1.29.2.6.42.2 +2 -2 jbossmq/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PersistenceManager.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java,v
retrieving revision 1.29.2.6.42.1
retrieving revision 1.29.2.6.42.2
diff -u -b -r1.29.2.6.42.1 -r1.29.2.6.42.2
--- PersistenceManager.java 27 May 2006 16:02:13 -0000 1.29.2.6.42.1
+++ PersistenceManager.java 6 Jul 2006 15:31:54 -0000 1.29.2.6.42.2
@@ -73,7 +73,7 @@
* @author Jayesh Parayali (jay...@ya...)
* @author Hiram Chirino (coj...@ho...)
* @author Adrian Brock (ad...@jb...)
- * @version $Revision: 1.29.2.6.42.1 $
+ * @version $Revision: 1.29.2.6.42.2 $
*/
public class PersistenceManager extends ServiceMBeanSupport
implements PersistenceManagerMBean, org.jboss.mq.pm.PersistenceManager, CacheStore
@@ -908,7 +908,7 @@
if (xid != null)
setBlob(stmt, 2, xid);
else
- stmt.setNull(2, java.sql.Types.BIGINT);
+ stmt.setNull(2, java.sql.Types.BLOB);
}
stmt.executeUpdate();
}
|
|
From: Manik S. <msu...@jb...> - 2006-07-06 14:45:49
|
User: msurtani
Date: 06/07/06 10:45:46
Modified: src/org/jboss/cache Tag: Branch_JBossCache_1_4_0
Version.java
Log:
Preparing for GA
Revision Changes Path
No revision
No revision
1.18.2.2 +4 -4 JBossCache/src/org/jboss/cache/Version.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Version.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/Version.java,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.1 -r1.18.2.2
--- Version.java 23 Jun 2006 16:23:51 -0000 1.18.2.1
+++ Version.java 6 Jul 2006 14:45:46 -0000 1.18.2.2
@@ -6,12 +6,12 @@
* Contains version information about this release of TreeCache.
*
* @author Bela Ban
- * @version $Id: Version.java,v 1.18.2.1 2006/06/23 16:23:51 msurtani Exp $
+ * @version $Id: Version.java,v 1.18.2.2 2006/07/06 14:45:46 msurtani Exp $
*/
public class Version {
- public static final String version="1.4.0.CR2";
- public static byte[] version_id={'0', '1', '4', '0', 'c'};
- public static final String cvs="$Id: Version.java,v 1.18.2.1 2006/06/23 16:23:51 msurtani Exp $";
+ public static final String version="1.4.0.GA";
+ public static byte[] version_id={'0', '1', '4', '0'};
+ public static final String cvs="$Id: Version.java,v 1.18.2.2 2006/07/06 14:45:46 msurtani Exp $";
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
|
|
From: Manik S. <msu...@jb...> - 2006-07-06 14:45:48
|
User: msurtani
Date: 06/07/06 10:45:46
Modified: JBossCache Tag: Branch_JBossCache_1_4_0 build.xml
Log:
Preparing for GA
Revision Changes Path
No revision
No revision
1.119.2.4 +2 -2 JBossCache/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/JBossCache/build.xml,v
retrieving revision 1.119.2.3
retrieving revision 1.119.2.4
diff -u -b -r1.119.2.3 -r1.119.2.4
--- build.xml 4 Jul 2006 17:03:39 -0000 1.119.2.3
+++ build.xml 6 Jul 2006 14:45:46 -0000 1.119.2.4
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml,v 1.119.2.3 2006/07/04 17:03:39 bwang Exp $ -->
+<!-- $Id: build.xml,v 1.119.2.4 2006/07/06 14:45:46 msurtani Exp $ -->
<project default="compile" name="JBossCache">
<property name="module.name" value="JBossCache"/>
<!--We now requires version to have no white space since Ant+JBossAop will sometime choke. -->
- <property name="module.version" value="1.4.0.CR2"/>
+ <property name="module.version" value="1.4.0.GA"/>
<property name="implementation.url" value="http://www.jboss.com/products/jbosscache"/>
<property file="build.properties"/>
<property name="root.dir" value="${basedir}"/>
|
|
From: Manik S. <msu...@jb...> - 2006-07-06 14:33:04
|
User: msurtani
Date: 06/07/06 10:33:01
Modified: tests/functional/org/jboss/cache/transaction Tag:
Branch_JBossCache_1_4_0 AbortionTest.java
Log:
JBCACHE-668 and JBCACHE-682
Revision Changes Path
No revision
No revision
1.1.4.3 +54 -26 JBossCache/tests/functional/org/jboss/cache/transaction/Attic/AbortionTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbortionTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/Attic/AbortionTest.java,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- AbortionTest.java 3 Jul 2006 17:24:53 -0000 1.1.4.2
+++ AbortionTest.java 6 Jul 2006 14:33:01 -0000 1.1.4.3
@@ -25,19 +25,24 @@
{
private TreeCache cache1, cache2, cache3;
- public void setUp() throws Exception
+ protected void setUp() throws Exception
{
cache1 = initCache(false);
+ TestingUtil.sleepThread(1500); // to ensure cache1 is the coordinator
cache2 = initCache(false);
cache3 = initCache(true);
- //cache3 = initCache(false);
}
- public void tearDown()
+
+ protected void tearDown() throws Exception
{
- destroyCache(cache1);
+ System.out.println("********* START: TEAR DOWN *************");
+ // start cache3's channel again so we can cleanly shut it down
+// ((MyTC) cache3).myChannel.connect("");
+// destroyCache(cache3);
destroyCache(cache2);
- destroyCache(cache3);
+ destroyCache(cache1);
+ System.out.println("********* END: TEAR DOWN *************");
}
private TreeCache initCache(boolean notifying) throws Exception
@@ -64,17 +69,27 @@
}
}
+ public void testSyncCaches() throws Exception
+ {
+ performTest(false, false);
+ }
+
public void testSyncCachesSyncCommitRollback() throws Exception
{
- doTestSyncCaches(true);
+ performTest(true, false);
}
- public void testSyncCaches() throws Exception
+ /**
+ * Note that this tests a *remote* beforeCompletion abort - which is a part of the calling instance's afterCompletion.
+ *
+ * @throws Exception
+ */
+ public void testAbortBeforeCompletion() throws Exception
{
- doTestSyncCaches(false);
+ performTest(true, true);
}
- private void doTestSyncCaches(boolean syncCommitRollback) throws Exception
+ private void performTest(boolean syncCommitRollback, boolean abortBeforeCompletion) throws Exception
{
cache1.setSyncCommitPhase(syncCommitRollback);
cache1.setSyncRollbackPhase(syncCommitRollback);
@@ -103,29 +118,48 @@
assertEquals("value", cache3.get("/test", "key"));
// replicates
-
+ final boolean fAbortBeforeCompletion = abortBeforeCompletion;
mgr3.notification = new NotifyingTransactionManager.Notification()
{
public void notify(Transaction tx) throws SystemException, RollbackException
{
+ final Transaction finalTx = tx;
System.out.println("Notify called.");
// add an aborting sync handler.
Synchronization abort = new Synchronization()
{
+ Transaction t = finalTx;
+
public void beforeCompletion()
{
- System.out.println("In abort.beforeCompletion");
+ System.out.println("In abort.beforeCompletion. Cache3 is " + cache3 + " and myChannel is " + ((MyTC) cache3).myChannel);
+ if (fAbortBeforeCompletion)
+ {
+ ((MyTC) cache3).myChannel.close();
+ System.out.println("Returning from abort.beforeCompletion");
+ try
+ {
+ finalTx.setRollbackOnly();
+ }
+ catch (SystemException e)
+ {
+ throw new RuntimeException("Unable to set rollback", e);
+ }
+ throw new RuntimeException("Dummy exception");
+ }
}
public void afterCompletion(int i)
{
- System.out.println("In abort.afterCompletion. Cache3 is " + cache3 + " and myChannel is " + ((MyTC)cache3).myChannel);
-// ((MyTC) cache3).myChannel.close();
- ((MyTC) cache3).myChannel.shutdown();
+ System.out.println("In abort.afterCompletion. Cache3 is " + cache3 + " and myChannel is " + ((MyTC) cache3).myChannel);
+ if (!fAbortBeforeCompletion)
+ {
+ ((MyTC) cache3).myChannel.close();
System.out.println("Returning from abort.afterCompletion");
throw new RuntimeException("Dummy exception");
}
+ }
};
OrderedSynchronizationHandler osh = OrderedSynchronizationHandler.getInstance(tx);
@@ -136,26 +170,20 @@
mgr1.begin();
Transaction tx = mgr1.getTransaction();
-
cache1.put("/test", "key", "value2");
tx.commit();
TestingUtil.sleepThread(5000);
- System.out.println(cache1.printLockInfo());
- System.out.println(cache2.printLockInfo());
- //System.out.println(cache3.printLockInfo());
-
+ // only test cache1 and cache2. Assume cache3 has crashed out.
assertEquals(0, cache1.getNumberOfLocksHeld());
assertEquals(0, cache2.getNumberOfLocksHeld());
- //assertEquals(0, cache3.getNumberOfLocksHeld());
-
- // these rollbacks fail since we're not XA compliant. The TM cannot issue a proper rollback.
-// assertEquals("put in transaction should have been rolled back", "value", cache1.get("/test", "key"));
-// assertEquals("put in transaction should have been rolled back", "value", cache2.get("/test", "key"));
+ assertEquals("put in transaction should NOT have been rolled back", "value2", cache1.get("/test", "key"));
+ assertEquals("put in transaction should NOT have been rolled back", "value2", cache2.get("/test", "key"));
}
+
public static class MyTC extends TreeCache
{
JChannel myChannel;
|
|
From: Manik S. <msu...@jb...> - 2006-07-06 14:33:03
|
User: msurtani
Date: 06/07/06 10:33:01
Modified: src/org/jboss/cache/interceptors Tag:
Branch_JBossCache_1_4_0 TxInterceptor.java
Log:
JBCACHE-668 and JBCACHE-682
Revision Changes Path
No revision
No revision
1.48.2.2 +4 -5 JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TxInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/TxInterceptor.java,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -u -b -r1.48.2.1 -r1.48.2.2
--- TxInterceptor.java 3 Jul 2006 17:24:52 -0000 1.48.2.1
+++ TxInterceptor.java 6 Jul 2006 14:33:01 -0000 1.48.2.2
@@ -703,16 +703,15 @@
}
catch (Throwable e)
{
- log.error("Commit failed, rolling back.", e);
+ log.error("Commit failed. Issuing a commit on the local tx to clear stale locks.", e);
try
{
-// tx.setRollbackOnly();
- tx.rollback();
+ tx.commit();
}
catch (Exception e2)
{
- log.error("Unable to roll back transaction", e2);
- throw new RuntimeException("Rollback after failed commit failed as well", e2);
+ log.error("Unable to re-run commit again to clear locks", e2);
+ throw new RuntimeException(e2);
}
throw new RuntimeException("Commit failed, marking tx to be rolled back.", e);
}
|
|
From: Kabir K. <kk...@jb...> - 2006-07-06 14:31:15
|
User: kkhan
Date: 06/07/06 10:31:12
Modified: src/main/org/jboss/aop/instrument
GeneratedAdvisorInstrumentor.java
Log:
Make advisor field for generated advisors non-final
Revision Changes Path
1.34 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: GeneratedAdvisorInstrumentor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- GeneratedAdvisorInstrumentor.java 28 Jun 2006 12:32:25 -0000 1.33
+++ GeneratedAdvisorInstrumentor.java 6 Jul 2006 14:31:12 -0000 1.34
@@ -536,7 +536,7 @@
forName("org.jboss.aop.Advisor"),
Instrumentor.HELPER_FIELD_NAME,
clazz);
- classAdvisor.setModifiers(Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL | Modifier.TRANSIENT);
+ classAdvisor.setModifiers(Modifier.PRIVATE | Modifier.STATIC | Modifier.TRANSIENT);
clazz.addField(classAdvisor, CtField.Initializer.byExpr("new " + getAdvisorFQN(clazz) + "()"));
CtMethod getAdvisor = CtNewMethod.getter("_getAdvisor", classAdvisor);
|
|
From: Carlo de W. <ca...@ne...> - 2006-07-06 14:28:44
|
User: wolfc
Date: 06/07/06 10:28:36
Added: src/test/org/jboss/ejb3/test/standalone/servicepojo/unit
ServicePOJOTestCase.java
Log:
EJBTHREE-323: unit test
Revision Changes Path
1.1 date: 2006/07/06 14:28:36; author: wolfc; state: Exp;jboss-ejb3/src/test/org/jboss/ejb3/test/standalone/servicepojo/unit/ServicePOJOTestCase.java
Index: ServicePOJOTestCase.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.ejb3.test.standalone.servicepojo.unit;
import java.util.Set;
import javax.management.MBeanServer;
import javax.management.MBeanServerConnection;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.naming.InitialContext;
import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
import org.jboss.ejb3.test.standalone.servicepojo.ServiceOneLocal;
import org.jboss.ejb3.test.standalone.servicepojo.ServiceOneManagement;
import org.jboss.mx.util.MBeanServerLocator;
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
public class ServicePOJOTestCase extends TestCase
{
public ServicePOJOTestCase(String name)
{
super(name);
}
private static MBeanServerConnection getServer()
{
return MBeanServerLocator.locate();
}
public void testLocalInterface() throws Exception
{
InitialContext ctx = new InitialContext();
ServiceOneLocal service = (ServiceOneLocal) ctx.lookup("ServiceOneBean/local");
service.setAttribute(1);
}
public void testManagementInterface() throws Exception
{
MBeanServerConnection server = getServer();
ObjectName name = new ObjectName("jboss.j2ee:jar=embedded-servicepojo,name=ServiceOneBean,service=EJB3,type=ManagementInterface");
Object params[] = { "me" };
String signature[] = { String.class.getName() };
String result = (String) server.invoke(name, "sayHello", params, signature);
assertEquals("Hello me", result);
}
public static Test suite() throws Exception
{
TestSuite suite = new TestSuite();
suite.addTestSuite(ServicePOJOTestCase.class);
// setup test so that embedded JBoss is started/stopped once for all tests here.
TestSetup wrapper = new TestSetup(suite)
{
protected void setUp()
{
startupEmbeddedJboss();
}
protected void tearDown()
{
shutdownEmbeddedJboss();
}
};
return wrapper;
}
public static void startupEmbeddedJboss()
{
EJB3StandaloneBootstrap.boot(null);
EJB3StandaloneBootstrap.scanClasspath("embedded-servicepojo.jar");
}
public static void shutdownEmbeddedJboss()
{
EJB3StandaloneBootstrap.shutdown();
}
}
|
185 messages has been excluded from this view by a project administrator.
