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: Gurkan E. <gur...@ya...> - 2006-07-06 19:49:01
|
User: gurkanerdogdu
Date: 06/07/06 15:48:57
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils
CacheUtil.java
Log:
Unnecessary imports and content assist in editor
Revision Changes Path
1.5 +0 -2 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheUtil.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CacheUtil.java 6 Jul 2006 17:17:02 -0000 1.4
+++ CacheUtil.java 6 Jul 2006 19:48:57 -0000 1.5
@@ -6,12 +6,10 @@
*/
package org.jboss.ide.eclipse.jbosscache.utils;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileReader;
import java.io.FileWriter;
import java.io.PrintWriter;
import java.lang.reflect.Field;
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:49:00
|
User: gurkanerdogdu
Date: 06/07/06 15:48:56
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/classpath
CacheClassPathContainer.java
Log:
Unnecessary imports and content assist in editor
Revision Changes Path
1.2 +0 -3 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/classpath/CacheClassPathContainer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheClassPathContainer.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/classpath/CacheClassPathContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheClassPathContainer.java 23 Mar 2006 11:12:31 -0000 1.1
+++ CacheClassPathContainer.java 6 Jul 2006 19:48:56 -0000 1.2
@@ -6,14 +6,11 @@
*/
package org.jboss.ide.eclipse.jbosscache.classpath;
-import java.io.IOException;
-import java.net.URL;
import java.util.ArrayList;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IPackageFragmentRoot;
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:49:00
|
User: gurkanerdogdu
Date: 06/07/06 15:48:55
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors
BaseXMLContentAssistProcessor.java
CacheXMLStructuredTextViewerConfiguration.java
CacheXMLContentAssistProcessor.java
CacheContentAssistProcessor.java
CacheAttributeMatcher.java
CacheXMLContentOutlineConfiguration.java
Log:
Unnecessary imports and content assist in editor
Revision Changes Path
1.2 +61 -0 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/BaseXMLContentAssistProcessor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BaseXMLContentAssistProcessor.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/BaseXMLContentAssistProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BaseXMLContentAssistProcessor.java 6 Jul 2006 17:17:01 -0000 1.1
+++ BaseXMLContentAssistProcessor.java 6 Jul 2006 19:48:55 -0000 1.2
@@ -26,6 +26,67 @@
public abstract class BaseXMLContentAssistProcessor extends XMLContentAssistProcessor {
+ @Override
+ protected void addTagNameProposals(ContentAssistRequest contentAssistRequest, int arg1){
+ // TODO Auto-generated method stub
+
+ //super.addTagNameProposals(contentAssistRequest, arg1);
+
+ IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
+ IDOMNode parentNode = (IDOMNode) contentAssistRequest.getParent();
+
+ String parentNodeName = parentNode.getNodeName();
+
+ // Find the attribute region and name for which this position should have a value proposed
+ IStructuredDocumentRegion open = node.getFirstStructuredDocumentRegion();
+ ITextRegionList openRegions = open.getRegions();
+ int i = openRegions.indexOf(contentAssistRequest.getRegion());
+
+ //No text
+ if(i == -1){
+ //Show All Elements with parent
+ List attributeValueProposals = getTagValueProposals(parentNodeName,"", contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest);
+ if(attributeValueProposals!=null) {
+ for (Iterator iter = attributeValueProposals.iterator(); iter.hasNext();) {
+ ICompletionProposal element = (ICompletionProposal) iter.next();
+ contentAssistRequest.addProposal(element);
+ }
+ }
+ }
+
+ else{
+
+ ITextRegion nameRegion = null;
+ while (i >= 0) {
+ nameRegion = openRegions.get(i--);
+
+ if (nameRegion.getType() == DOMRegionContext.XML_TAG_NAME)
+ break;
+ }
+
+ String matchString = contentAssistRequest.getMatchString();
+
+ int offset = contentAssistRequest.getReplacementBeginPosition();
+
+
+ List attributeValueProposals = getTagValueProposals(parentNodeName, matchString, offset, contentAssistRequest);
+ if(attributeValueProposals!=null) {
+ for (Iterator iter = attributeValueProposals.iterator(); iter.hasNext();) {
+ ICompletionProposal element = (ICompletionProposal) iter.next();
+ contentAssistRequest.addProposal(element);
+ }
+ }
+
+
+ }
+
+ }
+
+
+
+ abstract protected List getTagValueProposals(String parentName, String matchString, int offset, ContentAssistRequest contentAssistRequest);
+
+
protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) {
super.addAttributeValueProposals(contentAssistRequest);
1.2 +0 -15 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLStructuredTextViewerConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheXMLStructuredTextViewerConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLStructuredTextViewerConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheXMLStructuredTextViewerConfiguration.java 6 Jul 2006 17:17:01 -0000 1.1
+++ CacheXMLStructuredTextViewerConfiguration.java 6 Jul 2006 19:48:55 -0000 1.2
@@ -1,25 +1,10 @@
package org.jboss.ide.eclipse.jbosscache.editors;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitionTypes;
import org.eclipse.wst.xml.core.internal.provisional.text.IXMLPartitions;
import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
import org.eclipse.wst.xml.ui.internal.contentassist.NoRegionContentAssistProcessor;
1.2 +35 -0 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentAssistProcessor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheXMLContentAssistProcessor.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentAssistProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheXMLContentAssistProcessor.java 6 Jul 2006 17:17:01 -0000 1.1
+++ CacheXMLContentAssistProcessor.java 6 Jul 2006 19:48:55 -0000 1.2
@@ -7,7 +7,11 @@
import java.util.List;
import org.eclipse.jface.text.contentassist.CompletionProposal;
+import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
+import org.eclipse.wst.xml.ui.internal.editor.CMImageUtil;
+import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
+import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
public class CacheXMLContentAssistProcessor extends CacheContentAssistProcessor {
@@ -53,4 +57,35 @@
}
+ @Override
+ protected List getTagValueProposals(String parentName,String matchString, int offset, ContentAssistRequest contentAssistRequest) {
+
+ if(parentName == null || parentName.equals(""))
+ return null;
+
+ List types = null;
+ if(matchString.equals("")){
+ //Add all possible tags
+
+ types = this.extractor.findTagMatcher(parentName);
+
+ }else{
+ //Get Match String
+ types = this.extractor.findTagMatcher(parentName,matchString);
+ }
+
+ List proposals = new ArrayList(types.size() );
+ for (int i=0;i<types.size();i++) {
+ String element = getEndTag((String) types.get(i));
+ proposals.add(new CustomCompletionProposal(element,offset,matchString.length(),element.length(),XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC),(String) types.get(i),null,null,0,false));
+ }
+ return proposals;
+
+ }
+
+ private String getEndTag(String tag){
+ return tag+">"+"</"+tag+">";
+ }
+
+
}
1.2 +0 -2 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheContentAssistProcessor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheContentAssistProcessor.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheContentAssistProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheContentAssistProcessor.java 6 Jul 2006 17:17:01 -0000 1.1
+++ CacheContentAssistProcessor.java 6 Jul 2006 19:48:55 -0000 1.2
@@ -1,7 +1,5 @@
package org.jboss.ide.eclipse.jbosscache.editors;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
public abstract class CacheContentAssistProcessor extends BaseXMLContentAssistProcessor {
1.2 +142 -2 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheAttributeMatcher.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheAttributeMatcher.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheAttributeMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheAttributeMatcher.java 6 Jul 2006 17:17:01 -0000 1.1
+++ CacheAttributeMatcher.java 6 Jul 2006 19:48:55 -0000 1.2
@@ -1,6 +1,8 @@
package org.jboss.ide.eclipse.jbosscache.editors;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
public class CacheAttributeMatcher {
@@ -32,6 +34,13 @@
"maxAgeSeconds",
};
+ private String [] SERVER = {"classpath","mbean"};
+ private String [] MBEAN = {"depends","attribute"};
+ private String [] ATTRIBUTE = {"config"};
+ private String [] CONFIG = {"attribute","buddyReplicationEnabled","buddyLocatorClass","buddyLocatorProperties","buddyPoolName","buddyCommunicationTimeout","autoDataGravitation","dataGravitationRemoveOnFind","dataGravitationSearchBackupTrees","passivation","preload","shared","cacheloader","region"};
+ private String [] CACHELOADER = {"class","properties","async","fetchPersistentState","ignoreModifications","purgeOnStartup"};
+ private String [] REGION ={"attribute"};
+
public CacheAttributeMatcher(){
@@ -39,15 +48,146 @@
public List findMatchingPropertyTypes(String type){
List l = new ArrayList();
- boolean foundFirst = false;
for (int i = 0; i < namedProperty.length; i++) {
String element = namedProperty[i];
if(element.startsWith(type) ) {
- foundFirst = true;
l.add(element);
}
}
return l;
}
+ public List findTagMatcher(String parentName){
+ List l = new ArrayList();
+ if(parentName.equals("server")){
+ for (int i = 0; i < SERVER.length; i++) {
+ String element = SERVER[i];
+ l.add(element);
+ }
+
+ return l;
+ }
+ if(parentName.equals("mbean")){
+ for (int i = 0; i < MBEAN.length; i++) {
+ String element = MBEAN[i];
+ l.add(element);
+ }
+
+ return l;
+ }
+ if(parentName.equals("attribute")){
+ for (int i = 0; i < ATTRIBUTE.length; i++) {
+ String element = ATTRIBUTE[i];
+ l.add(element);
+ }
+
+ return l;
+ }
+ if(parentName.equals("config")){
+ for (int i = 0; i < CONFIG.length; i++) {
+ String element = CONFIG[i];
+ l.add(element);
+ }
+
+ return l;
+ }
+
+ if(parentName.equals("cacheloader")){
+ for (int i = 0; i < CACHELOADER.length; i++) {
+ String element = CACHELOADER[i];
+ l.add(element);
+ }
+
+ return l;
+ }
+
+ if(parentName.equals("region")){
+ for (int i = 0; i < REGION.length; i++) {
+ String element = REGION[i];
+ l.add(element);
+ }
+
+ return l;
+ }
+
+ return Collections.EMPTY_LIST;
+
+ }
+
+ public List findTagMatcher(String parentName,String type){
+ List l = new ArrayList();
+ if(parentName.equals("server")){
+ for (int i = 0; i < SERVER.length; i++) {
+ String element = SERVER[i];
+ if(element.startsWith(type) ) {
+ l.add(element);
+ }
+
+ }
+
+ return l;
+ }
+ if(parentName.equals("mbean")){
+ for (int i = 0; i < MBEAN.length; i++) {
+ String element = MBEAN[i];
+ if(element.startsWith(type) ) {
+ l.add(element);
+ }
+
+ }
+
+ return l;
+ }
+ if(parentName.equals("attribute")){
+ for (int i = 0; i < ATTRIBUTE.length; i++) {
+ String element = ATTRIBUTE[i];
+ if(element.startsWith(type) ) {
+ l.add(element);
+ }
+
+ }
+
+ return l;
+ }
+ if(parentName.equals("config")){
+ for (int i = 0; i < CONFIG.length; i++) {
+ String element = CONFIG[i];
+ if(element.startsWith(type) ) {
+ l.add(element);
+ }
+
+ }
+
+ return l;
+ }
+
+ if(parentName.equals("cacheloader")){
+ for (int i = 0; i < CACHELOADER.length; i++) {
+ String element = CACHELOADER[i];
+ if(element.startsWith(type) ) {
+ l.add(element);
+ }
+
+ }
+
+ return l;
+ }
+
+ if(parentName.equals("region")){
+ for (int i = 0; i < REGION.length; i++) {
+ String element = REGION[i];
+ if(element.startsWith(type) ) {
+ l.add(element);
+ }
+
+ }
+
+ return l;
+ }
+
+ return Collections.EMPTY_LIST;
+
+ }
+
+
}
1.2 +0 -8 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentOutlineConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheXMLContentOutlineConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentOutlineConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheXMLContentOutlineConfiguration.java 6 Jul 2006 17:17:01 -0000 1.1
+++ CacheXMLContentOutlineConfiguration.java 6 Jul 2006 19:48:55 -0000 1.2
@@ -1,14 +1,6 @@
package org.jboss.ide.eclipse.jbosscache.editors;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.xml.ui.views.contentoutline.XMLContentOutlineConfiguration;
-import org.w3c.dom.Node;
public class CacheXMLContentOutlineConfiguration extends
XMLContentOutlineConfiguration {
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:49:00
|
User: gurkanerdogdu
Date: 06/07/06 15:48:56
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions
CreateNodeAction.java DuplicateAction.java
ConnectAction.java DeleteConfigurationAction.java
EditConfigurationAction.java
Log:
Unnecessary imports and content assist in editor
Revision Changes Path
1.2 +0 -6 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/CreateNodeAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CreateNodeAction.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/CreateNodeAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CreateNodeAction.java 13 Dec 2005 16:04:30 -0000 1.1
+++ CreateNodeAction.java 6 Jul 2006 19:48:56 -0000 1.2
@@ -10,7 +10,6 @@
import org.jboss.ide.eclipse.jbosscache.dialogs.AddNewNodeDialog;
import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheInstance;
import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheRootInstance;
-import org.jboss.ide.eclipse.jbosscache.model.internal.TreeCacheManager;
import org.jboss.ide.eclipse.jbosscache.views.config.TreeCacheView;
/**
@@ -37,16 +36,12 @@
public void run()
{
Object selection = getTreeViewer().getSelection();
- TreeCacheManager manager = null;
AddNewNodeDialog addNewDialog = null;
- ICacheRootInstance rootInstance = null;
ICacheInstance cacheInstance = null;
/*New node as tree cache root node below instance root*/
if (selection instanceof ICacheRootInstance)
{
- rootInstance = (ICacheRootInstance) selection;
- manager = rootInstance.getTreeCacheManager();
addNewDialog = new AddNewNodeDialog(getTreeViewer().getShell(), getTreeViewer());
addNewDialog.setParentFqn(ICacheConstants.SEPERATOR);
addNewDialog.open();
@@ -55,7 +50,6 @@
else if (selection instanceof ICacheInstance)
{
cacheInstance = (ICacheInstance) selection;
- manager = cacheInstance.getRootInstance().getTreeCacheManager();
addNewDialog = new AddNewNodeDialog(getTreeViewer().getShell(), getTreeViewer());
addNewDialog.setParentFqn(cacheInstance.getFqnName());
addNewDialog.open();
1.3 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/DuplicateAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DuplicateAction.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/DuplicateAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DuplicateAction.java 23 Mar 2006 11:12:31 -0000 1.2
+++ DuplicateAction.java 6 Jul 2006 19:48:56 -0000 1.3
@@ -7,7 +7,6 @@
package org.jboss.ide.eclipse.jbosscache.actions;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.eclipse.ui.part.ViewPart;
1.3 +0 -10 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/ConnectAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConnectAction.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/ConnectAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ConnectAction.java 23 Mar 2006 11:12:31 -0000 1.2
+++ ConnectAction.java 6 Jul 2006 19:48:56 -0000 1.3
@@ -13,23 +13,13 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin;
import org.jboss.ide.eclipse.jbosscache.internal.CacheMessages;
1.4 +0 -3 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/DeleteConfigurationAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DeleteConfigurationAction.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/DeleteConfigurationAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DeleteConfigurationAction.java 24 Mar 2006 13:31:19 -0000 1.3
+++ DeleteConfigurationAction.java 6 Jul 2006 19:48:56 -0000 1.4
@@ -10,7 +10,6 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -20,10 +19,8 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.EditorPart;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.editors.input.CacheFileEditorInput;
import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheRootInstance;
1.3 +0 -5 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/EditConfigurationAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EditConfigurationAction.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/actions/EditConfigurationAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- EditConfigurationAction.java 23 Mar 2006 11:12:31 -0000 1.2
+++ EditConfigurationAction.java 6 Jul 2006 19:48:56 -0000 1.3
@@ -6,15 +6,10 @@
*/
package org.jboss.ide.eclipse.jbosscache.actions;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
-import org.hibernate.tool.hbm2x.XMLPrettyPrinter;
import org.jboss.ide.eclipse.jbosscache.editors.input.CacheFileEditorInput;
import org.jboss.ide.eclipse.jbosscache.internal.CacheMessages;
import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheRootInstance;
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:49:00
|
User: gurkanerdogdu
Date: 06/07/06 15:48:56
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal
RemoteCacheManager.java
Log:
Unnecessary imports and content assist in editor
Revision Changes Path
1.2 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/RemoteCacheManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemoteCacheManager.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/RemoteCacheManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteCacheManager.java 23 Mar 2006 11:12:30 -0000 1.1
+++ RemoteCacheManager.java 6 Jul 2006 19:48:56 -0000 1.2
@@ -12,7 +12,6 @@
import javax.naming.InitialContext;
-import org.eclipse.jface.dialogs.ErrorDialog;
import org.jboss.cache.Fqn;
import org.jboss.cache.TreeCacheMBean;
import org.jboss.cache.aop.TreeCacheAopMBean;
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:48:59
|
User: gurkanerdogdu
Date: 06/07/06 15:48:56
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs
CViewDialogContentProvider.java RefreshDialog.java
CacheLoaderDefDialog.java
Log:
Unnecessary imports and content assist in editor
Revision Changes Path
1.3 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CViewDialogContentProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CViewDialogContentProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CViewDialogContentProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CViewDialogContentProvider.java 23 Mar 2006 11:12:32 -0000 1.2
+++ CViewDialogContentProvider.java 6 Jul 2006 19:48:56 -0000 1.3
@@ -21,7 +21,6 @@
import org.eclipse.jface.viewers.Viewer;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin;
-import org.jboss.ide.eclipse.jbosscache.utils.CacheClassLoader;
import org.jboss.ide.eclipse.jbosscache.utils.CacheUtil;
import org.jboss.ide.eclipse.jbosscache.views.content.TableContentProvider.TableContentModel;
1.2 +0 -4 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/RefreshDialog.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RefreshDialog.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/RefreshDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RefreshDialog.java 23 Mar 2006 11:12:32 -0000 1.1
+++ RefreshDialog.java 6 Jul 2006 19:48:56 -0000 1.2
@@ -7,13 +7,11 @@
package org.jboss.ide.eclipse.jbosscache.dialogs;
import java.lang.reflect.InvocationTargetException;
-import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -30,9 +28,7 @@
import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin;
import org.jboss.ide.eclipse.jbosscache.internal.CacheMessages;
import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheRootInstance;
-import org.jboss.ide.eclipse.jbosscache.model.factory.CacheInstanceFactory;
import org.jboss.ide.eclipse.jbosscache.model.internal.RemoteCacheManager;
-import org.jboss.ide.eclipse.jbosscache.utils.CacheUtil;
import org.jboss.ide.eclipse.jbosscache.views.config.TreeCacheView;
/**
1.2 +0 -3 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderDefDialog.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheLoaderDefDialog.java 6 Jul 2006 17:17:02 -0000 1.1
+++ CacheLoaderDefDialog.java 6 Jul 2006 19:48:56 -0000 1.2
@@ -2,12 +2,10 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorListener;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
@@ -20,7 +18,6 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
import org.jboss.ide.eclipse.jbosscache.internal.CacheMessages;
import org.jboss.ide.eclipse.jbosscache.model.CacheLoaderPropModel;
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:48:59
|
User: gurkanerdogdu
Date: 06/07/06 15:48:56
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages
CopyOfCacheLoaderConfigurationPage.java
CacheLoaderConfigurationPage.java
RemoteConfigurationPage.java
StandardConfigurationPage.java
Log:
Unnecessary imports and content assist in editor
Revision Changes Path
1.2 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CopyOfCacheLoaderConfigurationPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CopyOfCacheLoaderConfigurationPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CopyOfCacheLoaderConfigurationPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CopyOfCacheLoaderConfigurationPage.java 6 Jul 2006 17:17:01 -0000 1.1
+++ CopyOfCacheLoaderConfigurationPage.java 6 Jul 2006 19:48:56 -0000 1.2
@@ -12,7 +12,6 @@
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
1.4 +0 -2 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderConfigurationPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderConfigurationPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderConfigurationPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CacheLoaderConfigurationPage.java 6 Jul 2006 17:17:01 -0000 1.3
+++ CacheLoaderConfigurationPage.java 6 Jul 2006 19:48:56 -0000 1.4
@@ -7,13 +7,11 @@
package org.jboss.ide.eclipse.jbosscache.wizards.pages;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
1.2 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/RemoteConfigurationPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemoteConfigurationPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/RemoteConfigurationPage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RemoteConfigurationPage.java 23 Mar 2006 11:12:32 -0000 1.1
+++ RemoteConfigurationPage.java 6 Jul 2006 19:48:56 -0000 1.2
@@ -33,7 +33,6 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Widget;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
-import org.jboss.ide.eclipse.jbosscache.model.config.CacheConfigParams;
import org.jboss.ide.eclipse.jbosscache.utils.CacheUtil;
public class RemoteConfigurationPage extends WizardPage implements ModifyListener,ISelectionChangedListener
1.5 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/StandardConfigurationPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StandardConfigurationPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/StandardConfigurationPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- StandardConfigurationPage.java 6 Jul 2006 17:17:01 -0000 1.4
+++ StandardConfigurationPage.java 6 Jul 2006 19:48:56 -0000 1.5
@@ -34,7 +34,6 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.forms.widgets.Hyperlink;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.internal.CacheMessages;
import org.jboss.ide.eclipse.jbosscache.model.config.CacheConfigParams;
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:18:01
|
User: gurkanerdogdu
Date: 06/07/06 13:18:00
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache .classpath
plugin.xml
Log:
Revision Changes Path
1.4 +7 -3 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/.classpath
(In the diff below, changes in quantity of whitespace are not shown.)
Index: .classpath
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/.classpath,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- .classpath 23 Mar 2006 11:12:30 -0000 1.3
+++ .classpath 6 Jul 2006 17:18:00 -0000 1.4
@@ -6,21 +6,25 @@
<classpathentry kind="lib" path="lib/bsh-2.0b4.jar"/>
<classpathentry kind="lib" path="lib/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="lib/derby.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-tools.jar"/>
<classpathentry kind="lib" path="lib/javassist.jar"/>
+ <classpathentry kind="lib" path="lib/jbossall-client.jar"/>
<classpathentry kind="lib" path="lib/jboss-aop.jar"/>
- <classpathentry sourcepath="/JBossCache124" kind="lib" path="lib/jboss-cache.jar"/>
+ <classpathentry kind="lib" path="lib/jboss-cache.jar"/>
<classpathentry kind="lib" path="lib/jboss-common.jar"/>
<classpathentry kind="lib" path="lib/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="lib/jboss-jmx.jar"/>
<classpathentry kind="lib" path="lib/jboss-minimal.jar"/>
+ <classpathentry kind="lib" path="lib/jboss-serialization.jar"/>
<classpathentry kind="lib" path="lib/jboss-system.jar"/>
+ <classpathentry kind="lib" path="lib/jdbm-1.0.jar"/>
<classpathentry kind="lib" path="lib/jgroups.jar"/>
<classpathentry kind="lib" path="lib/jrunit.jar"/>
+ <classpathentry kind="lib" path="lib/jtidy-r8-21122004.jar"/>
<classpathentry kind="lib" path="lib/junit.jar"/>
<classpathentry kind="lib" path="lib/log4j.jar"/>
<classpathentry kind="lib" path="lib/qdox.jar"/>
<classpathentry kind="lib" path="lib/trove.jar"/>
- <classpathentry kind="lib" path="lib/hibernate-tools.jar"/>
- <classpathentry kind="lib" path="lib/jtidy-r8-21122004.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.3 +61 -0 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/plugin.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: plugin.xml
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- plugin.xml 23 Mar 2006 11:12:30 -0000 1.2
+++ plugin.xml 6 Jul 2006 17:18:00 -0000 1.3
@@ -97,5 +97,66 @@
class="org.jboss.ide.eclipse.jbosscache.classpath.CacheClassPathContainerInitializer"
id="org.jboss.ide.eclipse.jbosscache.classpath.CACHE_124"/>
</extension>
+<extension point="org.eclipse.core.runtime.contentTypes">
+ <content-type
+ base-type="org.eclipse.core.runtime.xml"
+ file-extensions="xml"
+ file-names="cache.cfg.xml"
+ id="cfgxmlsource"
+ name="Cache Configuration Content-type"
+ priority="low">
+ <describer class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber">
+ <parameter
+ name="element"
+ value="server"/>
+ </describer>
+ </content-type>
+ </extension>
+
+ <extension
+ point="org.eclipse.wst.sse.core.modelHandler">
+ <modelHandler
+ associatedContentTypeId="org.jboss.ide.eclipse.jbosscache.cfgxmlsource"
+ class="org.jboss.ide.eclipse.jbosscache.editors.ModelHandlerForCacheXML"
+ default="false"
+ id="org.jboss.ide.eclipse.jbosscache.cfg.xml">
+ </modelHandler>
+ </extension>
+
+
+ <extension
+ point="org.eclipse.wst.sse.ui.editorConfiguration">
+ <sourceViewerConfiguration
+ target="org.jboss.ide.eclipse.jbosscache.cfgxmlsource"
+ class="org.jboss.ide.eclipse.jbosscache.editors.CacheXMLStructuredTextViewerConfiguration"
+ />
+ <contentOutlineConfiguration
+ target="org.jboss.ide.eclipse.jbosscache.cfgxmlsource"
+ class="org.jboss.ide.eclipse.jbosscache.editors.CacheXMLContentOutlineConfiguration"
+ />
+ </extension>
+
+
+ <extension point = "org.eclipse.wst.xml.core.catalogContributions">
+ <catalogContribution>
+ <uri
+ name="cache"
+ uri="dtd/cache-configuration.dtd"/>
+ </catalogContribution>
+ </extension>
+
+ <extension
+ point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
+ <adapterFactoryDescription
+ class="org.jboss.ide.eclipse.jbosscache.editors.AdapterFactoryProviderForCacheXML">
+ </adapterFactoryDescription>
+ </extension>
+
+
+
+
+
+
+
</plugin>
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:54
|
User: gurkanerdogdu
Date: 06/07/06 13:17:50
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/META-INF
MANIFEST.MF
Log:
Revision Changes Path
1.4 +13 -7 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/META-INF/MANIFEST.MF
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MANIFEST.MF
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/META-INF/MANIFEST.MF,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MANIFEST.MF 23 Mar 2006 11:12:32 -0000 1.3
+++ MANIFEST.MF 6 Jul 2006 17:17:50 -0000 1.4
@@ -6,18 +6,21 @@
Bundle-Activator: org.jboss.ide.eclipse.jbosscache.JBossCachePlugin
Bundle-Vendor: JBoss
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
+Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.core.resources,
org.eclipse.gef,
- org.eclipse.jface,
- org.eclipse.ui,
org.eclipse.ui.console,
- org.eclipse.ui.editors,
org.eclipse.ui.ide,
- org.eclipse.ui.workbench.texteditor,
org.eclipse.jdt.core,
org.eclipse.jdt.ui,
- org.eclipse.jdt.launching
+ org.eclipse.jdt.launching,
+ org.eclipse.ui.forms,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.wst.sse.ui
Eclipse-AutoStart: true
Bundle-ClassPath: lib/bsh-2.0b4.jar,
lib/commons-logging.jar,
@@ -39,4 +42,7 @@
org.jboss.ide.eclipse.jbosscache.jar,
lib/jbossall-client.jar,
lib/hibernate-tools.jar,
- lib/jtidy-r8-21122004.jar
+ lib/jtidy-r8-21122004.jar,
+ lib/derby.jar,
+ lib/jboss-serialization.jar,
+ lib/jdbm-1.0.jar
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:13
|
User: gurkanerdogdu
Date: 06/07/06 13:17:02
Added: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model
CacheLoaderPropModel.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.1 date: 2006/07/06 17:17:02; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/CacheLoaderPropModel.java
Index: CacheLoaderPropModel.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.model;
import java.util.ArrayList;
import java.util.List;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.utils.CacheUtil;
public class CacheLoaderPropModel {
private String property;
private String value;
public CacheLoaderPropModel(){
}
public List getPropertyModels(String classLoaderName,boolean isDs){
List list = new ArrayList();
if(classLoaderName.equals(ICacheConstants.CACHE_LOADER_CLASSES[1]) || classLoaderName.equals(ICacheConstants.CACHE_LOADER_CLASSES[2])){
String[][] temp = CacheUtil.getPropertiesForJdbc(isDs);
CacheLoaderPropModel model = null;
for(int i=0;i<temp.length;i++){
model = new CacheLoaderPropModel();
model.property = temp[i][0];
model.value = temp[i][1];
list.add(model);
}
}
return list;
}
public String getProperty() {
return property;
}
public String getValue() {
return value;
}
public void setProperty(String property) {
this.property = property;
}
public void setValue(String value) {
this.value = value;
}
}
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:12
|
User: gurkanerdogdu
Date: 06/07/06 13:17:01
Added: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors
BaseXMLContentAssistProcessor.java
CacheXMLStructuredTextViewerConfiguration.java
CacheXMLContentAssistProcessor.java
AdapterFactoryProviderForCacheXML.java
CacheContentAssistProcessor.java
ModelHandlerForCacheXML.java
CacheAttributeMatcher.java
CacheXMLContentOutlineConfiguration.java
AdapterFactoryProviderForXML.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/BaseXMLContentAssistProcessor.java
Index: BaseXMLContentAssistProcessor.java
===================================================================
/*******************************************************************************
* Copyright (c) 2001, 2004, 2006 IBM Corporation, JBoss Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
* Jens Lukowski/Innoopract - initial renaming/restructuring
* Max Rydahl Andersen, JBoss Inc. - extracted attribueValue proposal mechanism.
*******************************************************************************/
package org.jboss.ide.eclipse.jbosscache.editors;
import java.util.Iterator;
import java.util.List;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentAssistProcessor;
public abstract class BaseXMLContentAssistProcessor extends XMLContentAssistProcessor {
protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) {
super.addAttributeValueProposals(contentAssistRequest);
IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
// Find the attribute region and name for which this position should have a value proposed
IStructuredDocumentRegion open = node.getFirstStructuredDocumentRegion();
ITextRegionList openRegions = open.getRegions();
int i = openRegions.indexOf(contentAssistRequest.getRegion() );
if (i < 0)
return;
ITextRegion nameRegion = null;
while (i >= 0) {
nameRegion = openRegions.get(i--);
if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)
break;
}
String matchString = contentAssistRequest.getMatchString();
int offset = contentAssistRequest.getReplacementBeginPosition();
if (matchString == null) {
matchString = ""; //$NON-NLS-1$
}
if (matchString.length() > 0 && (matchString.startsWith("\"") || matchString.startsWith("'") ) ) {//$NON-NLS-2$//$NON-NLS-1$
matchString = matchString.substring(1);
offset = offset+1;
}
if (nameRegion != null) {
String attributeName = open.getText(nameRegion);
List attributeValueProposals = getAttributeValueProposals(attributeName, matchString, offset, contentAssistRequest);
if(attributeValueProposals!=null) {
for (Iterator iter = attributeValueProposals.iterator(); iter.hasNext();) {
ICompletionProposal element = (ICompletionProposal) iter.next();
contentAssistRequest.addProposal(element);
}
}
}
}
abstract protected List getAttributeValueProposals(String attributeName, String matchString, int offset, ContentAssistRequest contentAssistRequest);
}
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLStructuredTextViewerConfiguration.java
Index: CacheXMLStructuredTextViewerConfiguration.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.editors;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextHover;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitionTypes;
import org.eclipse.wst.xml.core.internal.provisional.text.IXMLPartitions;
import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
import org.eclipse.wst.xml.ui.internal.contentassist.NoRegionContentAssistProcessor;
public class CacheXMLStructuredTextViewerConfiguration extends StructuredTextViewerConfigurationXML {
public CacheXMLStructuredTextViewerConfiguration() {
super();
}
protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) {
IContentAssistProcessor[] processors = null;
if ((partitionType == IStructuredPartitionTypes.DEFAULT_PARTITION) || (partitionType == IXMLPartitions.XML_DEFAULT)) {
processors = new IContentAssistProcessor[]{new CacheXMLContentAssistProcessor()};
}
else if (partitionType == IStructuredPartitionTypes.UNKNOWN_PARTITION) {
processors = new IContentAssistProcessor[]{new NoRegionContentAssistProcessor()};
}
return processors;
}
}
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentAssistProcessor.java
Index: CacheXMLContentAssistProcessor.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.editors;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.eclipse.jface.text.contentassist.CompletionProposal;
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
public class CacheXMLContentAssistProcessor extends CacheContentAssistProcessor {
CacheAttributeMatcher extractor;
static String[] propertyNames;
private static CacheXMLContentAssistProcessor processor = new CacheXMLContentAssistProcessor();
public static CacheXMLContentAssistProcessor getContentAsist(){
return processor;
}
public CacheXMLContentAssistProcessor() {
super();
extractor = new CacheAttributeMatcher();
}
protected List getAttributeValueProposals(String attributeName, String matchString, int offset, ContentAssistRequest contentAssistRequest) {
String nodeName = contentAssistRequest.getNode().getNodeName();
if("attribute".equals(nodeName) && "name".equals(attributeName)) {
List types = this.extractor.findMatchingPropertyTypes(matchString);
List proposals = new ArrayList(types.size() );
for (Iterator iter = types.iterator(); iter.hasNext();) {
String element = (String) iter.next();
proposals.add(new CompletionProposal(element, offset, matchString.length(), element.length(), null, null, null, null) );
}
return proposals;
}
if("mapping".equals(nodeName) && "resource".equals(attributeName)) {
}
return Collections.EMPTY_LIST;
}
}
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/AdapterFactoryProviderForCacheXML.java
Index: AdapterFactoryProviderForCacheXML.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.editors;
import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler;
public class AdapterFactoryProviderForCacheXML extends AdapterFactoryProviderForXML {
public boolean isFor(IDocumentTypeHandler contentTypeDescription) {
return (contentTypeDescription instanceof ModelHandlerForCacheXML);
}
}
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheContentAssistProcessor.java
Index: CacheContentAssistProcessor.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.editors;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
public abstract class CacheContentAssistProcessor extends BaseXMLContentAssistProcessor {
public CacheContentAssistProcessor() {
}
}
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/ModelHandlerForCacheXML.java
Index: ModelHandlerForCacheXML.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.editors;
import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
import org.eclipse.wst.sse.core.internal.ltk.modelhandler.AbstractModelHandler;
import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentCharsetDetector;
import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
import org.eclipse.wst.xml.core.internal.modelhandler.XMLModelLoader;
public class ModelHandlerForCacheXML extends AbstractModelHandler implements IModelHandler {
final static String CONTENTTYPE_ID = "org.jboss.ide.eclipse.jbosscache.cfgxmlsource"; //$NON-NLS-1$
final private static String MODELHANDLER_ID = "org.jboss.ide.eclipse.jbosscache.cfg.xml"; //$NON-NLS-1$
public ModelHandlerForCacheXML() {
super();
setId(MODELHANDLER_ID);
setAssociatedContentTypeId(CONTENTTYPE_ID);
}
public IDocumentCharsetDetector getEncodingDetector() {
return new XMLDocumentCharsetDetector();
}
public IDocumentLoader getDocumentLoader() {
return new XMLDocumentLoader();
}
public IModelLoader getModelLoader() {
return new XMLModelLoader();
}
}
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheAttributeMatcher.java
Index: CacheAttributeMatcher.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.editors;
import java.util.ArrayList;
import java.util.List;
public class CacheAttributeMatcher {
private String[] namedProperty = {"BuddyReplicationConfig",
"CacheMode",
"ClusterName",
"EvictionPolicyClass",
"EvictionPolicyConfig",
"CacheLoaderConfiguration",
"FetchInMemoryState",
"InitialStateRetrievalTimeout",
"InactiveOnStartup",
"NodeLockingScheme",
"IsolationLevel",
"LockAcquisitionTimeout",
"ReplicationVersion",
"ReplQueueInterval",
"SyncReplTimeout",
"ReplQueueMaxElements",
"StateTransferVersion",
"TransactionManagerLookupClass",
"UseInterceptorMbeans",
"UseRegionBasedMarshalling",
"UseReplQueue",
"wakeUpIntervalSeconds",
"maxNodes",
"timeToLiveSeconds",
"maxAgeSeconds",
};
public CacheAttributeMatcher(){
}
public List findMatchingPropertyTypes(String type){
List l = new ArrayList();
boolean foundFirst = false;
for (int i = 0; i < namedProperty.length; i++) {
String element = namedProperty[i];
if(element.startsWith(type) ) {
foundFirst = true;
l.add(element);
}
}
return l;
}
}
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/CacheXMLContentOutlineConfiguration.java
Index: CacheXMLContentOutlineConfiguration.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.editors;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.xml.ui.views.contentoutline.XMLContentOutlineConfiguration;
import org.w3c.dom.Node;
public class CacheXMLContentOutlineConfiguration extends
XMLContentOutlineConfiguration {
}
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/editors/AdapterFactoryProviderForXML.java
Index: AdapterFactoryProviderForXML.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.editors;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
public class AdapterFactoryProviderForXML extends org.eclipse.wst.xml.ui.internal.registry.AdapterFactoryProviderForXML {
public AdapterFactoryProviderForXML() {
}
protected void addContentBasedFactories(IStructuredModel structuredModel) {
super.addContentBasedFactories(structuredModel);
/* doesn't work in M7 since it doesnt select the content type deterministicly
FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry();
//Assert.isNotNull(factoryRegistry, "Program Error: client caller must ensure model has factory registry"); //$NON-NLS-1$
INodeAdapterFactory factory = null;
factory = factoryRegistry.getFactoryFor(IJFaceNodeAdapter.class);
if (factory == null) {
factory = new JFaceNodeAdapterFactoryForXML();
factoryRegistry.addFactory(factory);
}
super.addContentBasedFactories(structuredModel);
*/
}
}
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:10
|
User: gurkanerdogdu
Date: 06/07/06 13:17:02
Added: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs
CacheLoaderDefDialog.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.1 date: 2006/07/06 17:17:02; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java
Index: CacheLoaderDefDialog.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.dialogs;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellEditorListener;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.TableEditor;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
import org.jboss.ide.eclipse.jbosscache.internal.CacheMessages;
import org.jboss.ide.eclipse.jbosscache.model.CacheLoaderPropModel;
import org.jboss.ide.eclipse.jbosscache.wizards.pages.CacheLoaderLableProvider;
import org.jboss.ide.eclipse.jbosscache.wizards.pages.CacheLoaderTableProvider;
public class CacheLoaderDefDialog extends Dialog {
private TableViewer tableViewer;
private Button chkUseDataSource;
private Label lblUseDataSource;
private Text txtDataSource;
private Button chkTableCreate;
private Button chkTableDelete;
private String[] COLUMN_NAMES = new String[]{CacheMessages.Column_Properties,CacheMessages.Column_Value};
private String cacheLoaderType;
public CacheLoaderDefDialog(Shell parentShell,String cacheLoaderString) {
super(parentShell);
setShellStyle(SWT.SHELL_TRIM);
this.cacheLoaderType = cacheLoaderString;
}
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell
.setText(CacheMessages.Dialog_Title);
}
/**
* Create the contents of the dialog (above the button bar).
*
* Subclasses should overide.
*
* @param parent
* the parent composite to contain the dialog area
* @return the dialog area control
*/
protected Control createDialogArea(Composite parent) {
Composite outer = (Composite) super.createDialogArea(parent);
createTable(outer);
return outer;
}
private boolean useDs = false;
/**
* Create tree table
*
* @param outer
*/
private void createTable(Composite outer) {
outer.setLayout(new GridLayout(2,false));
GridData data = new GridData(GridData.FILL_HORIZONTAL);
GridData dChekc = new GridData(GridData.FILL_HORIZONTAL);
dChekc.horizontalSpan = 2;
chkUseDataSource = new Button(outer,SWT.CHECK);
chkUseDataSource.setText("Use DataSource");
chkUseDataSource.setLayoutData(dChekc);
chkUseDataSource.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e){
String [] params = new String[2];
params[0] = cacheLoaderType;
chkUseDataSource = (Button)e.widget;
if(chkUseDataSource.getSelection()){
lblUseDataSource.setEnabled(true);
txtDataSource.setEnabled(true);
txtDataSource.setEnabled(true);
useDs = true;
}else{
lblUseDataSource.setEnabled(false);
txtDataSource.setEnabled(false);
txtDataSource.setEnabled(false);
useDs = false;
}
params[1] = Boolean.toString(useDs);
tableViewer.setInput(params);
}
});
lblUseDataSource = new Label(outer,SWT.NONE);
lblUseDataSource.setText("Data Source Name: ");
lblUseDataSource.setEnabled(false);
txtDataSource = new Text(outer,SWT.BORDER);
txtDataSource.setLayoutData(data);
txtDataSource.setEnabled(false);
chkTableCreate = new Button(outer,SWT.CHECK);
chkTableCreate.setText("Create DB Table");
chkTableCreate.setLayoutData(dChekc);
chkTableDelete = new Button(outer,SWT.CHECK);
chkTableDelete.setText("Delete DB Table");
chkTableDelete.setLayoutData(dChekc);
tableViewer = new TableViewer(outer,SWT.FULL_SELECTION | SWT.BORDER);
tableViewer.setContentProvider(new CacheLoaderTableProvider());
tableViewer.setLabelProvider(new CacheLoaderLableProvider());
tableViewer.setColumnProperties(new String[]{"property","value"});
GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
gridData.heightHint = convertVerticalDLUsToPixels(200);
gridData.widthHint = convertHorizontalDLUsToPixels(300);
gridData.horizontalSpan = 2;
Table table = tableViewer.getTable();
table.setLayoutData(gridData);
table.setLinesVisible(true);
table.setHeaderVisible(true);
TableColumn propCol = new TableColumn(table,SWT.NONE);
propCol.setAlignment(SWT.CENTER);
propCol.setText(COLUMN_NAMES[0]);
propCol.setResizable(true);
propCol.setWidth(150);
TableColumn valCol = new TableColumn(table,SWT.NONE);
valCol.setAlignment(SWT.CENTER);
valCol.setText(COLUMN_NAMES[1]);
valCol.setResizable(true);
valCol.setWidth(150);
TextCellEditor editor = new TextCellEditor(table);
tableViewer.setCellEditors(new CellEditor[]{null,editor});
ICellModifier modif = new ICellModifier(){
public boolean canModify(Object element, String property) {
if(property.equals("property"))
return false;
return true;
}
public Object getValue(Object element, String property) {
if(property.equals("value")){
CacheLoaderPropModel model = (CacheLoaderPropModel)element;
return model.getValue();
}
return null;
}
public void modify(Object element, String property, Object value) {
if(property.equals("value")){
CacheLoaderPropModel model = null;
if(element instanceof Item){
model = (CacheLoaderPropModel)((Item)element).getData();
}else
model = (CacheLoaderPropModel)element;
model.setValue(value.toString());
tableViewer.refresh(model);
}
}
};
String [] params = new String[2];
params[0] = cacheLoaderType;
params[1] = Boolean.toString(useDs);
tableViewer.setCellModifier(modif);
tableViewer.setInput(params);
}
}
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:10
|
User: gurkanerdogdu
Date: 06/07/06 13:17:01
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards
NewCacheProjectWizard.java
NewCacheConfigurationWizard.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.2 +36 -36 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NewCacheProjectWizard.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewCacheProjectWizard.java 23 Mar 2006 11:12:31 -0000 1.1
+++ NewCacheProjectWizard.java 6 Jul 2006 17:17:01 -0000 1.2
@@ -68,9 +68,9 @@
public class NewCacheProjectWizard extends Wizard implements INewWizard
{
private WizardNewProjectCreationPage page = null;
- private Button btnCache124 = null;
- private Button btnCache130 = null;
- private boolean is124 = true;
+// private Button btnCache124 = null;
+// private Button btnCache130 = null;
+// private boolean is124 = true;
public void init(IWorkbench workbench, IStructuredSelection selection)
{
@@ -89,35 +89,35 @@
private void addCacheVersionGroup(Composite pageContainer)
{
- Group group = new Group(pageContainer,SWT.SHADOW_ETCHED_IN);
- group.setText("Cache Version");
- GridLayout gridLayout = new GridLayout(2,false);
- group.setLayout(gridLayout);
- group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- btnCache124 = new Button(group,SWT.RADIO | SWT.RIGHT);
- btnCache124.setText("Cache 1.2.4");
- btnCache124.setSelection(true);//default
-
- btnCache130 = new Button(group,SWT.RADIO | SWT.RIGHT);
- btnCache130.setText("Cache 1.3.0");
- btnCache130.setEnabled(false);
-
- btnCache124.addSelectionListener(new SelectionAdapter(){
-
- public void widgetSelected(SelectionEvent e)
- {
- is124 = true;
- }
- });
-
- btnCache130.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e)
- {
- is124 = false;
- }
- });
-
+// Group group = new Group(pageContainer,SWT.SHADOW_ETCHED_IN);
+// group.setText("Cache Version");
+// GridLayout gridLayout = new GridLayout(2,false);
+// group.setLayout(gridLayout);
+// group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+//
+// btnCache124 = new Button(group,SWT.RADIO | SWT.RIGHT);
+// btnCache124.setText("Cache 1.2.4");
+// btnCache124.setSelection(true);//default
+//
+// btnCache130 = new Button(group,SWT.RADIO | SWT.RIGHT);
+// btnCache130.setText("Cache 1.3.0");
+// btnCache130.setEnabled(false);
+//
+// btnCache124.addSelectionListener(new SelectionAdapter(){
+//
+// public void widgetSelected(SelectionEvent e)
+// {
+// is124 = true;
+// }
+// });
+//
+// btnCache130.addSelectionListener(new SelectionAdapter(){
+// public void widgetSelected(SelectionEvent e)
+// {
+// is124 = false;
+// }
+// });
+//
}
private void createSrcAndBin(IJavaProject project, IProgressMonitor monitor) throws CoreException
@@ -147,7 +147,7 @@
private IClasspathEntry[] configureClasspathEntries(ArrayList classpathEntries) throws CoreException
{
classpathEntries.add(JavaRuntime.getDefaultJREContainerEntry());
- if (is124)
+ if (true)
{
classpathEntries.add(JavaCore.newContainerEntry(new Path(CacheVersion124CpContainer.CONTAINER_ID)));
}
@@ -237,7 +237,7 @@
IPath path = page.getProjectHandle().getLocation();
- path = path.append(new Path("default_tree_cache-service.xml"));
+ path = path.append(new Path("cache.cfg.xml"));
File file = path.toFile();
CacheFileEditorInput edInput = new CacheFileEditorInput(file);
@@ -356,13 +356,13 @@
private void addDefaultXml(IProject project) throws Exception{
IPath location = project.getLocation();
- IPath fileLocation = location.append(new Path("default_tree_cache-service.xml"));
+ IPath fileLocation = location.append(new Path("cache.cfg.xml"));
File crFile = fileLocation.toFile();
try{
crFile.createNewFile();
- String path = Platform.asLocalURL(JBossCachePlugin.getDefault().getBundle().getResource("org/jboss/ide/eclipse/jbosscache/default_tree_cache-service.xml")).getFile().toString();
+ String path = Platform.asLocalURL(JBossCachePlugin.getDefault().getBundle().getResource("org/jboss/ide/eclipse/jbosscache/cache.cfg.xml")).getFile().toString();
File file = new File(path);
1.4 +295 -253 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheConfigurationWizard.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NewCacheConfigurationWizard.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheConfigurationWizard.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewCacheConfigurationWizard.java 24 Mar 2006 13:31:20 -0000 1.3
+++ NewCacheConfigurationWizard.java 6 Jul 2006 17:17:01 -0000 1.4
@@ -10,6 +10,9 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.PrintWriter;
+import java.io.StringReader;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
@@ -43,16 +46,16 @@
/**
* Used for getting necessary configuration informations from the user
+ *
* @author Gurkaner
*/
-public class NewCacheConfigurationWizard extends Wizard implements INewWizard
-{
+public class NewCacheConfigurationWizard extends Wizard implements INewWizard {
- /*First wizard page of this wizard*/
+ /* First wizard page of this wizard */
private StandardConfigurationPage stdConfPage;
- /*Cache loader wizard page*/
- private CacheLoaderConfigurationPage cacheLoaderConfPage;
+ // /*Cache loader wizard page*/
+ // private CacheLoaderConfigurationPage cacheLoaderConfPage;
private WizardNewFileCreationPage creationPage;
@@ -64,13 +67,11 @@
private IWorkbench workBench;
- public NewCacheConfigurationWizard()
- {
+ public NewCacheConfigurationWizard() {
super();
}
- public NewCacheConfigurationWizard(ViewPart viewPart)
- {
+ public NewCacheConfigurationWizard(ViewPart viewPart) {
super();
this.viewPart = viewPart;
cacheConfigModel = new CacheConfigurationModel();
@@ -82,71 +83,81 @@
* Initialization of this wizard
*
*/
- protected void initializeWizard()
- {
+ protected void initializeWizard() {
setWindowTitle("New Cache Configuration");
- stdConfPage = new StandardConfigurationPage("stdConfPage", "Base Cache Configuration", JBossCachePlugin
+ stdConfPage = new StandardConfigurationPage("stdConfPage",
+ "Base Cache Configuration", JBossCachePlugin
.getImageDescriptor("icons/new_wiz.gif"));
addPage(stdConfPage);
- cacheLoaderConfPage = new CacheLoaderConfigurationPage("cachConfPage", "Cache Loader Configuration",
- JBossCachePlugin.getImageDescriptor("icons/new_wiz.gif"));
- addPage(cacheLoaderConfPage);
+ // cacheLoaderConfPage = new
+ // CacheLoaderConfigurationPage("cachConfPage", "Cache Loader
+ // Configuration",
+ // JBossCachePlugin.getImageDescriptor("icons/new_wiz.gif"));
+ // addPage(cacheLoaderConfPage);
}
/**
- * Before return, implement necessary actions when the finish button pressed in wizard
+ * Before return, implement necessary actions when the finish button pressed
+ * in wizard
+ *
* @param none
* @return true or false
*/
- public boolean performFinish()
- {
- try
- {
+ public boolean performFinish() {
+ try {
setStdConfigModel();
- setCacheLoaderConfig(getCacheConfigurationModel().getCacheLoaderConfig());
+ // setCacheLoaderConfig(getCacheConfigurationModel().getCacheLoaderConfig());
String cacheName = stdConfPage.getTxtCacheName().getText();
String confFileName = stdConfPage.getTxtConfFileName().getText();
- //File file = CacheUtil.createNewFile(cacheConfigModel.getCacheName()+ICacheConstants.XML_FILEEXTENSION);
- final File file = new Path(cacheConfigModel.getDirectoryName() + File.separatorChar + confFileName
+ // File file =
+ // CacheUtil.createNewFile(cacheConfigModel.getCacheName()+ICacheConstants.XML_FILEEXTENSION);
+ final File file = new Path(cacheConfigModel.getDirectoryName()
+ + File.separatorChar + confFileName
+ ICacheConstants.XML_FILEEXTENSION).toFile();
- if (file.exists())
- {
- MessageDialog.openError(getShell(), CacheUtil
- .getResourceBundleValue(ICacheConstants.CONFIGURATION_ERROR_MESSAGE_CACHEEXIST_TITLE), CacheUtil
+ if (file.exists()) {
+ MessageDialog
+ .openError(
+ getShell(),
+ CacheUtil
+ .getResourceBundleValue(ICacheConstants.CONFIGURATION_ERROR_MESSAGE_CACHEEXIST_TITLE),
+ CacheUtil
.getResourceBundleValue(ICacheConstants.CONFIGURATION_ERROR_MESSAGE_CACHEEXIST));
return false;
}
- //Name of the Cache Instance Check
- if (!CacheUtil.checkCacheName(cacheName))
- {
- MessageDialog.openError(getShell(),
- CacheMessages.NewCacheConfigurationWizard_Same_Cache_Instance_Name_ErrorDialog_Title, CacheMessages
- .bind(CacheMessages.NewCacheConfigurationWizard_Same_Cache_Instance_Name_ErrorDialog_Message,
+ // Name of the Cache Instance Check
+ if (!CacheUtil.checkCacheName(cacheName)) {
+ MessageDialog
+ .openError(
+ getShell(),
+ CacheMessages.NewCacheConfigurationWizard_Same_Cache_Instance_Name_ErrorDialog_Title,
+ CacheMessages
+ .bind(
+ CacheMessages.NewCacheConfigurationWizard_Same_Cache_Instance_Name_ErrorDialog_Message,
cacheName));
return false;
}
- IRunnableWithProgress prog = new IRunnableWithProgress()
- {
+ IRunnableWithProgress prog = new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- monitor.beginTask(JBossCachePlugin.getResourceBundle().getString(
- ICacheConstants.CONFIGURATION_MONITOR_TASK_NAME), 10);
- try
- {
+ public void run(IProgressMonitor monitor)
+ throws InvocationTargetException, InterruptedException {
+ monitor
+ .beginTask(
+ JBossCachePlugin
+ .getResourceBundle()
+ .getString(
+ ICacheConstants.CONFIGURATION_MONITOR_TASK_NAME),
+ 10);
+ try {
monitor.worked(1);
- CacheUtil.saveMetaDataInformation(cacheConfigModel, monitor, file);
- }
- catch (Exception e)
- {
+ CacheUtil.saveMetaDataInformation(cacheConfigModel,
+ monitor, file);
+ } catch (Exception e) {
throw new InvocationTargetException(e);
- }
- finally
- {
+ } finally {
monitor.done();
}
}
@@ -154,144 +165,175 @@
};
getContainer().run(true, false, prog);
- ICacheRootInstance rootInstance = CacheInstanceFactory.getCacheRootInstance(cacheName, cacheConfigModel
+ ICacheRootInstance rootInstance = CacheInstanceFactory
+ .getCacheRootInstance(cacheName, cacheConfigModel
.getDirectoryName()
+ File.separatorChar + confFileName + ".xml");
rootInstance.setIsDirty(true);
rootInstance.setCacheConfigParams(stdConfPage.getConfigParams());
rootInstance.setCacheType(stdConfPage.getCmbCacheType().getText());
- CacheInstanceFactory.getCacheRootMainInstance().addRootInstanceChild(rootInstance);
+ CacheInstanceFactory.getCacheRootMainInstance()
+ .addRootInstanceChild(rootInstance);
/*
* Set Cache Perspective
*/
if (workBench == null)
- workBench = viewPart.getSite().getWorkbenchWindow().getWorkbench();
+ workBench = viewPart.getSite().getWorkbenchWindow()
+ .getWorkbench();
IPerspectiveRegistry perspReg = workBench.getPerspectiveRegistry();
- IPerspectiveDescriptor desc = perspReg.findPerspectiveWithId(ICacheConstants.CACHE_PERSPECTIVE_ID);
- if (!workBench.getActiveWorkbenchWindow().getActivePage().getPerspective().equals(desc))
- {
- workBench.getActiveWorkbenchWindow().getActivePage().setPerspective(desc);
+ IPerspectiveDescriptor desc = perspReg
+ .findPerspectiveWithId(ICacheConstants.CACHE_PERSPECTIVE_ID);
+ if (!workBench.getActiveWorkbenchWindow().getActivePage()
+ .getPerspective().equals(desc)) {
+ workBench.getActiveWorkbenchWindow().getActivePage()
+ .setPerspective(desc);
System.out.println("Not in active perspective");
}
FileInputStream inStream = new FileInputStream(file);
ByteArrayOutputStream os = new ByteArrayOutputStream();
- XMLPrettyPrinter.prettyPrint(inStream,os);
+ XMLPrettyPrinter.prettyPrint(inStream, os);
FileOutputStream outStream = new FileOutputStream(file);
outStream.write(os.toByteArray());
outStream.flush();
outStream.close();
-
inStream.close();
-
CacheFileEditorInput edInput = new CacheFileEditorInput(file);
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(edInput,"org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart");
-
- }
- catch (Exception e)
- {
- IStatus status = new Status(IStatus.ERROR, ICacheConstants.CACHE_PLUGIN_UNIQUE_ID, IStatus.OK, e.getMessage(),
- e);
+ PlatformUI
+ .getWorkbench()
+ .getActiveWorkbenchWindow()
+ .getActivePage()
+ .openEditor(edInput,
+ "org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart");
+
+ } catch (Exception e) {
+ IStatus status = new Status(IStatus.ERROR,
+ ICacheConstants.CACHE_PLUGIN_UNIQUE_ID, IStatus.OK, e
+ .getMessage(), e);
JBossCachePlugin.getDefault().getLog().log(status);
return false;
}
return true;
- }//end of method
+ }// end of method
/**
* Get standart configuration model information from this wizard page
+ *
* @param none
* @return void
*/
- private void setStdConfigModel()
- {
- cacheConfigModel.setDirectoryName(stdConfPage.getTxtDirectoryName().getText().trim());
- cacheConfigModel.setCacheName(stdConfPage.getTxtCacheName().getText().trim());
- cacheConfigModel.setCacheMode(stdConfPage.getCmbCacheMode().getText().trim());
- cacheConfigModel.setClusterName(stdConfPage.getTxtClusterName().getText().trim());
- //cacheConfigModel.setEvictionPolicyClass(stdConfPage.getTxtEvictionPolicyClass().getText());
- cacheConfigModel.setFetchStateOnStartup(stdConfPage.getChkFetchStateOnStartup().getSelection());
- cacheConfigModel.setInitialStateRetrievalTimeOut(stdConfPage.getTxtInitialStateRetrievalTimeout().getText()
+ private void setStdConfigModel() {
+ cacheConfigModel.setCacheType(stdConfPage.getCmbCacheType().getText()
.trim());
- cacheConfigModel.setIsolationLevel(stdConfPage.getCmbIsolationLevel().getText().trim());
- cacheConfigModel.setLockAcquisitionTimeOut(stdConfPage.getTxtLockAcquisitionTimeout().getText().trim());
- cacheConfigModel.setReplQueueInterval(stdConfPage.getTxtReplicationQueueInterval().getText().trim());
- cacheConfigModel.setReplQueueMaxElements(stdConfPage.getTxtReplQueueMaxElements().getText().trim());
- cacheConfigModel.setSyncReplicationTimeOut(stdConfPage.getTxtSyncReplTimeout().getText().trim());
- cacheConfigModel.setTransManagerLookUpClass(stdConfPage.getCmbTransactionManager().getText().trim());
- cacheConfigModel.setUseReplQueue(stdConfPage.getChkUseReplicationQueue().getSelection());
+ cacheConfigModel.setDirectoryName(stdConfPage.getTxtDirectoryName()
+ .getText().trim());
+ cacheConfigModel.setCacheName(stdConfPage.getTxtCacheName().getText()
+ .trim());
+ cacheConfigModel.setCacheMode(stdConfPage.getCmbCacheMode().getText()
+ .trim());
+ cacheConfigModel.setClusterName(stdConfPage.getTxtClusterName()
+ .getText().trim());
+ cacheConfigModel.setTransManagerLookUpClass(stdConfPage
+ .getCmbTransactionManager().getText().trim());
+ cacheConfigModel.setNodeLockingSchema(stdConfPage
+ .getCmbNodeLockingScheme().getText().trim());
+ cacheConfigModel.setEvictionPolicyClass(stdConfPage
+ .getCmbDefaultEvcitionPolicy().getText().trim());
+ cacheConfigModel.setCacheLoaderClass(stdConfPage
+ .getCmbCacheLoaderClass().getText().trim());
+ cacheConfigModel.setBodyReplicationEnabled(stdConfPage
+ .getChkBuddyReplicationEnabled().getSelection());
+ cacheConfigModel.setUseInterceptorMBeans(stdConfPage
+ .getChkUseInterceptorMBean().getSelection());
+ cacheConfigModel.setFetchStateOnStartup(stdConfPage
+ .getChkFetchStateOnStartup().getSelection());
+ cacheConfigModel.setInitialStateRetrievalTimeOut(stdConfPage
+ .getTxtInitialStateRetrievalTimeout().getText().trim());
+ cacheConfigModel.setIsolationLevel(stdConfPage.getCmbIsolationLevel()
+ .getText().trim());
+ cacheConfigModel.setLockAcquisitionTimeOut(stdConfPage
+ .getTxtLockAcquisitionTimeout().getText().trim());
+ cacheConfigModel.setReplQueueInterval(stdConfPage
+ .getTxtReplicationQueueInterval().getText().trim());
+ cacheConfigModel.setReplQueueMaxElements(stdConfPage
+ .getTxtReplQueueMaxElements().getText().trim());
+ cacheConfigModel.setSyncReplicationTimeOut(stdConfPage
+ .getTxtSyncReplTimeout().getText().trim());
+ cacheConfigModel.setUseReplQueue(stdConfPage
+ .getChkUseReplicationQueue().getSelection());
}
/**
* Set the cache loader model information from this wizard page
+ *
* @param cacheLoaderConfig
*/
- private void setCacheLoaderConfig(CacheLoaderConfigInternal cacheLoaderConfig)
- {
- int indexOfCacheLoaderClass = cacheLoaderConfPage.getCmbCacheLoaderClass().getSelectionIndex();
-
- cacheLoaderConfig.setCacheLoaderAsynchronous(cacheLoaderConfPage.getChkCacheLoaderAsynchronous().getSelection());
- cacheLoaderConfig.setCacheLoaderClass(cacheLoaderConfPage.getCmbCacheLoaderClass().getText().trim());
- cacheLoaderConfig.setCacheLoaderFetchPersistentState(cacheLoaderConfPage.getChkCacheLoaderFetchPersistentState()
- .getSelection());
- cacheLoaderConfig.setCacheLoaderFetchTransientState(cacheLoaderConfPage.getChkCacheLoaderFetchTransientState()
- .getSelection());
- cacheLoaderConfig.setCacheLoaderPassivation(cacheLoaderConfPage.getChkCacheLoaderPassivation().getSelection());
- cacheLoaderConfig.setCacheLoaderPreload(cacheLoaderConfPage.getTxtCacheLoaderPreload().getText().trim());
- cacheLoaderConfig.setCacheLoaderShared(cacheLoaderConfPage.getChkCacheLoaderShared().getSelection());
-
- switch (indexOfCacheLoaderClass)
- {
- case 0 :
-
- cacheLoaderConfig.setUseDataSource(cacheLoaderConfPage.getBtnUseDataSource().getSelection());
- cacheLoaderConfig.setJdbcCacheLoader(true);
- cacheLoaderConfig.setDataSource(cacheLoaderConfPage.getTxtDataSource().getText().trim());
- cacheLoaderConfig.setDriver(cacheLoaderConfPage.getCmbDriver().getText().trim());
- cacheLoaderConfig.setDriverUrl(cacheLoaderConfPage.getCmbDriverUrl().getText().trim());
- cacheLoaderConfig.setFqnColumn(cacheLoaderConfPage.getTxtFqnColumn().getText().trim());
- cacheLoaderConfig.setFqnType(cacheLoaderConfPage.getTxtFqnType().getText().trim());
- cacheLoaderConfig.setNodeColumn(cacheLoaderConfPage.getTxtNodeColumn().getText().trim());
- cacheLoaderConfig.setNodeType(cacheLoaderConfPage.getTxtNodeType().getText().trim());
- cacheLoaderConfig.setParentColumn(cacheLoaderConfPage.getTxtParentColumn().getText().trim());
- cacheLoaderConfig.setPassword(cacheLoaderConfPage.getTxtPassword().getText().trim());
- cacheLoaderConfig.setTableCreate(cacheLoaderConfPage.getChkTableCreate().getSelection());
- cacheLoaderConfig.setTableDrop(cacheLoaderConfPage.getChkTableDrop().getSelection());
- cacheLoaderConfig.setTableName(cacheLoaderConfPage.getTxtTableName().getText().trim());
- cacheLoaderConfig.setUserName(cacheLoaderConfPage.getTxtUser().getText().trim());
-
- break;
-
- case 1 :
-
- cacheLoaderConfig.setFileCacheLoader(true);
- cacheLoaderConfig.setFileLocation(cacheLoaderConfPage.getTxtLocation().getText().trim());
-
- break;
-
- default :
- }
-
- }//end of method
-
+ // private void setCacheLoaderConfig(CacheLoaderConfigInternal
+ // cacheLoaderConfig)
+ // {
+ // int indexOfCacheLoaderClass =
+ // cacheLoaderConfPage.getCmbCacheLoaderClass().getSelectionIndex();
+ //
+ // cacheLoaderConfig.setCacheLoaderAsynchronous(cacheLoaderConfPage.getChkCacheLoaderAsynchronous().getSelection());
+ // cacheLoaderConfig.setCacheLoaderClass(cacheLoaderConfPage.getCmbCacheLoaderClass().getText().trim());
+ // cacheLoaderConfig.setCacheLoaderFetchPersistentState(cacheLoaderConfPage.getChkCacheLoaderFetchPersistentState()
+ // .getSelection());
+ // cacheLoaderConfig.setCacheLoaderFetchTransientState(cacheLoaderConfPage.getChkCacheLoaderFetchTransientState()
+ // .getSelection());
+ // cacheLoaderConfig.setCacheLoaderPassivation(cacheLoaderConfPage.getChkCacheLoaderPassivation().getSelection());
+ // cacheLoaderConfig.setCacheLoaderPreload(cacheLoaderConfPage.getTxtCacheLoaderPreload().getText().trim());
+ // cacheLoaderConfig.setCacheLoaderShared(cacheLoaderConfPage.getChkCacheLoaderShared().getSelection());
+ //
+ // switch (indexOfCacheLoaderClass)
+ // {
+ // case 0 :
+ //
+ // cacheLoaderConfig.setUseDataSource(cacheLoaderConfPage.getBtnUseDataSource().getSelection());
+ // cacheLoaderConfig.setJdbcCacheLoader(true);
+ // cacheLoaderConfig.setDataSource(cacheLoaderConfPage.getTxtDataSource().getText().trim());
+ // cacheLoaderConfig.setDriver(cacheLoaderConfPage.getCmbDriver().getText().trim());
+ // cacheLoaderConfig.setDriverUrl(cacheLoaderConfPage.getCmbDriverUrl().getText().trim());
+ // cacheLoaderConfig.setFqnColumn(cacheLoaderConfPage.getTxtFqnColumn().getText().trim());
+ // cacheLoaderConfig.setFqnType(cacheLoaderConfPage.getTxtFqnType().getText().trim());
+ // cacheLoaderConfig.setNodeColumn(cacheLoaderConfPage.getTxtNodeColumn().getText().trim());
+ // cacheLoaderConfig.setNodeType(cacheLoaderConfPage.getTxtNodeType().getText().trim());
+ // cacheLoaderConfig.setParentColumn(cacheLoaderConfPage.getTxtParentColumn().getText().trim());
+ // cacheLoaderConfig.setPassword(cacheLoaderConfPage.getTxtPassword().getText().trim());
+ // cacheLoaderConfig.setTableCreate(cacheLoaderConfPage.getChkTableCreate().getSelection());
+ // cacheLoaderConfig.setTableDrop(cacheLoaderConfPage.getChkTableDrop().getSelection());
+ // cacheLoaderConfig.setTableName(cacheLoaderConfPage.getTxtTableName().getText().trim());
+ // cacheLoaderConfig.setUserName(cacheLoaderConfPage.getTxtUser().getText().trim());
+ //
+ // break;
+ //
+ // case 1 :
+ //
+ // cacheLoaderConfig.setFileCacheLoader(true);
+ // cacheLoaderConfig.setFileLocation(cacheLoaderConfPage.getTxtLocation().getText().trim());
+ //
+ // break;
+ //
+ // default :
+ // }
+ //
+ // }//end of method
/**
* Get this configuration model
+ *
* @return
*/
- public CacheConfigurationModel getCacheConfigurationModel()
- {
+ public CacheConfigurationModel getCacheConfigurationModel() {
return this.cacheConfigModel;
}
- public void init(IWorkbench workbench, IStructuredSelection selection)
- {
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
this.workBench = workbench;
this.selection = selection;
@@ -300,4 +342,4 @@
initializeWizard();
}
-}//end of class
+}// end of class
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:09
|
User: gurkanerdogdu
Date: 06/07/06 13:17:01
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/config
CacheConfigurationModel.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.3 +61 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/config/CacheConfigurationModel.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheConfigurationModel.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/config/CacheConfigurationModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CacheConfigurationModel.java 24 Mar 2006 13:31:20 -0000 1.2
+++ CacheConfigurationModel.java 6 Jul 2006 17:17:01 -0000 1.3
@@ -26,12 +26,16 @@
private String cacheName;
+ private String cacheType;
+
private String cacheMode;
private String clusterName;
private String transManagerLookUpClass;
+ private String nodeLockingSchema; /*IDE 2.0 version Optimistic/Pessimistic*/
+
private String isolationLevel;
private boolean useReplQueue;
@@ -46,12 +50,20 @@
private String lockAcquisitionTimeOut;
- private boolean fetchStateOnStartup;
+ private boolean fetchStateOnStartup; /*FetchInMemoryState*/
private boolean useMarshalling = false;
+ private boolean bodyReplicationEnabled; /*IDE 2.0 version*/
+
+ private boolean useInterceptorMBeans; /*IDE 2.0 version*/
+
private String evictionPolicyClass;
+ private String cacheLoaderClass; /*IDE 2.0 version*/
+
+
+
/**Model instance */
private CacheConfigurationModel cachConfModel;
@@ -1078,4 +1090,52 @@
{
this.directoryName = directoryName;
}
+
+public boolean isBodyReplicationEnabled() {
+ return bodyReplicationEnabled;
+}
+
+public void setBodyReplicationEnabled(boolean bodyReplicationEnabled) {
+ this.bodyReplicationEnabled = bodyReplicationEnabled;
+}
+
+public String getCacheLoaderClass() {
+ return cacheLoaderClass;
+}
+
+public void setCacheLoaderClass(String cacheLoaderClass) {
+ this.cacheLoaderClass = cacheLoaderClass;
+}
+
+public String getNodeLockingSchema() {
+ return nodeLockingSchema;
+}
+
+public void setNodeLockingSchema(String nodeLockingSchema) {
+ this.nodeLockingSchema = nodeLockingSchema;
+}
+
+public boolean isUseInterceptorMBeans() {
+ return useInterceptorMBeans;
+}
+
+public void setUseInterceptorMBeans(boolean useInterceptorMBeans) {
+ this.useInterceptorMBeans = useInterceptorMBeans;
+}
+
+public CacheConfigurationModel getCachConfModel() {
+ return cachConfModel;
+}
+
+public void setCachConfModel(CacheConfigurationModel cachConfModel) {
+ this.cachConfModel = cachConfModel;
+}
+
+public String getCacheType() {
+ return cacheType;
+}
+
+public void setCacheType(String cacheType) {
+ this.cacheType = cacheType;
+}
}
\ No newline at end of file
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:06
|
User: gurkanerdogdu
Date: 06/07/06 13:17:02
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/internal
messages.properties CacheMessages.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.3 +3 -0 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/internal/messages.properties
(In the diff below, changes in quantity of whitespace are not shown.)
Index: messages.properties
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/internal/messages.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- messages.properties 23 Mar 2006 11:12:31 -0000 1.2
+++ messages.properties 6 Jul 2006 17:17:02 -0000 1.3
@@ -58,6 +58,9 @@
ImportActionDialog_lblCacheType=Cache Type
CachePropertyPage_CachePropoerty_Page_LblConfDirectory=Configuration Directory
+Dialog_Title=Cache Loader Settings
+Column_Properties=Properties
+Column_Value=Value
ImportActionDialog_Select_File_To_Import=Select File...
########################Wizard Pages#####################################
1.3 +7 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/internal/CacheMessages.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheMessages.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/internal/CacheMessages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CacheMessages.java 23 Mar 2006 11:12:31 -0000 1.2
+++ CacheMessages.java 6 Jul 2006 17:17:02 -0000 1.3
@@ -17,12 +17,18 @@
{
private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.jbosscache.internal.messages";//$NON-NLS-1$
- public static String ContentViewDialog_titleForObjectType;
+ public static String Column_Properties;
+
+public static String Column_Value;
+
+public static String ContentViewDialog_titleForObjectType;
public static String ContentViewDialog_fieldName;
public static String ContentViewDialog_valueName;
+public static String Dialog_Title;
+
public static String NodeContentView_showObjectsFieldActionText;
public static String ShowObjectsFieldsAction_MessageDialog_Title;
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:04
|
User: gurkanerdogdu
Date: 06/07/06 13:17:02
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils
CacheUtil.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.4 +210 -68 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheUtil.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CacheUtil.java 24 Mar 2006 13:31:20 -0000 1.3
+++ CacheUtil.java 6 Jul 2006 17:17:02 -0000 1.4
@@ -6,8 +6,14 @@
*/
package org.jboss.ide.eclipse.jbosscache.utils;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
import java.io.FileWriter;
+import java.io.PrintWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
@@ -95,12 +101,7 @@
CacheLoaderConfigInternal cacheLoaderConfig = cacheConfigModel.getCacheLoaderConfig();
ClusterConfigInternal clusterConfig = cacheConfigModel.getClusterConfig();
- File file = fileLoc;//createNewFile(cacheConfigModel.getCacheName()+ICacheConstants.XML_FILEEXTENSION);
- // if(file.exists()){
- // MessageDialog.openError(shell,getResourceBundleValue(ICacheConstants.CONFIGURATION_ERROR_MESSAGE_CACHEEXIST_TITLE),getResourceBundleValue(ICacheConstants.CONFIGURATION_ERROR_MESSAGE_CACHEEXIST));
- // return;
- // }
-
+ File file = fileLoc;
FileWriter writer = null;
try
@@ -142,9 +143,11 @@
}
monitor.worked(3);
+ if(cacheConfigModel.getNodeLockingSchema().equals(ICacheConstants.NODE_LOCKING_SCHEME[1])){
childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
childMBeanMemonto.putString(ICacheConstants.NAME, "IsolationLevel");
childMBeanMemonto.putTextData(cacheConfigModel.getIsolationLevel());
+ }
childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
childMBeanMemonto.putString(ICacheConstants.NAME, "CacheMode");
@@ -274,7 +277,7 @@
monitor.subTask(ICacheConstants.CONFIGURATION_MONITOR_SUBTASK_CACHE_LOADER_CONFIG_NAME);
childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "FetchStateOnStartup");
+ childMBeanMemonto.putString(ICacheConstants.NAME, "FetchInMemoryState");
childMBeanMemonto.putTextData(Boolean.toString(cacheConfigModel.isFetchStateOnStartup()));
childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
@@ -291,78 +294,152 @@
monitor.worked(9);
- // childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- // childMBeanMemonto.putString(ICacheConstants.NAME,"EvictionPolicyClass");
- // childMBeanMemonto.putTextData(cacheConfigModel.getEvictionPolicyClass());
+
+ //Default Eviction Policy
+ if(!cacheConfigModel.getEvictionPolicyClass().equals("None")){
+ childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
+ childMBeanMemonto.putString(ICacheConstants.NAME,"EvictionPolicyConfig");
+
+ childMBeanMemonto = childMBeanMemonto.createChild(ICacheConstants.CONFIG);
+
+ childConfigMemento = childMBeanMemonto.createChild(ICacheConstants.ATTRIBUTE);
+ childConfigMemento.putString(ICacheConstants.NAME,"wakeUpIntervalSeconds");
+ childConfigMemento.putTextData("5");
+
+ childConfigMemento = childMBeanMemonto.createChild(ICacheConstants.REGION);
+ childConfigMemento.putString(ICacheConstants.NAME, "/_default_");
+ childConfigMemento.putString(ICacheConstants.POLICY_CLASS, cacheConfigModel.getEvictionPolicyClass());
+
+ childMBeanMemonto = childConfigMemento.createChild(ICacheConstants.ATTRIBUTE);
+ childMBeanMemonto.putString(ICacheConstants.NAME, "maxNodes");
+ childMBeanMemonto.putTextData("5000");
+
+ childMBeanMemonto = childConfigMemento.createChild(ICacheConstants.ATTRIBUTE);
+ childMBeanMemonto.putString(ICacheConstants.NAME, "timeToLiveSeconds");
+ childMBeanMemonto.putTextData("1000");
+ }
+
+
childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "UseMarshalling");
+ childMBeanMemonto.putString(ICacheConstants.NAME, "UseRegionBasedMarshalling");
childMBeanMemonto.putTextData(Boolean.toString(cacheConfigModel.isUseMarshalling()));
- if (!cacheConfigModel.getCacheLoaderConfig().getCacheLoaderClass().equals("None"))
+
+ if (!cacheConfigModel.getCacheLoaderClass().equals("None"))
{
childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "CacheLoaderClass");
- childMBeanMemonto.putTextData(cacheConfigModel.getCacheLoaderConfig().getCacheLoaderClass());
+ childMBeanMemonto.putString(ICacheConstants.NAME, "CacheLoaderConfiguration");
- childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "CacheLoaderConfig");
+ childConfigMemento = childMBeanMemonto.createChild(ICacheConstants.CONFIG);
- if (cacheLoaderConfig.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[0]))
- {
- if (!cacheLoaderConfig.isUseDataSource())
+ childMBeanMemonto = childConfigMemento.createChild(ICacheConstants.PASSIVATION);
+ childMBeanMemonto.putTextData("false");
+
+ childMBeanMemonto = childConfigMemento.createChild(ICacheConstants.PRELOAD);
+ childMBeanMemonto.putTextData("/");
+
+ childMBeanMemonto = childConfigMemento.createChild(ICacheConstants.SHARED);
+ childMBeanMemonto.putTextData("false");
+
+ childConfigMemento = childConfigMemento.createChild(ICacheConstants.CACHELOADER);
+ childMBeanMemonto = childConfigMemento.createChild(ICacheConstants.CLASS);
+ childMBeanMemonto.putTextData(cacheConfigModel.getCacheLoaderClass());
+
+ childMBeanMemonto= childConfigMemento.createChild("properties");
+
+ if (cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[1]) || cacheLoaderConfig.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[2]))
{
- childMBeanMemonto.putTextData("\n\t" + "cache.jdbc.table.name=" + cacheLoaderConfig.getTableName()
+ childMBeanMemonto.putTextData("\n\t" + "cache.jdbc.table.name=" + "jbosscache"
+ "\n" + "\t" + "cache.jdbc.table.create="
- + Boolean.toString(cacheLoaderConfig.isTableCreate()) + "\n" + "\t" + "cache.jdbc.table.drop="
- + Boolean.toString(cacheLoaderConfig.isTableDrop()) + "\n" + "\t" + "cache.jdbc.fqn.column="
- + cacheLoaderConfig.getFqnColumn() + "\n" + "\t" + "cache.jdbc.fqn.type="
- + cacheLoaderConfig.getFqnType() + "\n" + "\t" + "cache.jdbc.node.column="
- + cacheLoaderConfig.getNodeColumn() + "\n" + "\t" + "cache.jdbc.node.type="
- + cacheLoaderConfig.getNodeType() + "\n" + "\t" + "cache.jdbc.parent.column="
- + cacheLoaderConfig.getParentColumn() + "\n" + "\t" + "cache.jdbc.driver="
- + cacheLoaderConfig.getDriver() + "\n" + "\t" + "cache.jdbc.url="
- + cacheLoaderConfig.getDriverUrl() + "\n" + "\t" + "cache.jdbc.user="
- + cacheLoaderConfig.getUserName() + "\n" + "\t" + "cache.jdbc.password="
- + cacheLoaderConfig.getPassword() + "\n");
+ + "false" + "\n" + "\t" + "cache.jdbc.table.drop="
+ + "false" + "\n" + "\t" + "cache.jdbc.fqn.column="
+ + "fqn" + "\n" + "\t" + "cache.jdbc.fqn.type="
+ + "varchar(255)" + "\n" + "\t" + "cache.jdbc.node.column="
+ + "node" + "\n" + "\t" + "cache.jdbc.node.type="
+ + "blob" + "\n" + "\t" + "cache.jdbc.parent.column="
+ + "parent" + "\n" + "\t" + "cache.jdbc.driver="
+ + "driver" + "\n" + "\t" + "cache.jdbc.url="
+ + "url" + "\n" + "\t" + "cache.jdbc.user="
+ + "username" + "\n" + "\t" + "cache.jdbc.password="
+ + "password" + "\n");
+
}
- else
+ else if (cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[3]) ||
+ cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[4]) ||
+ cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[5]))
{
- StringBuffer buffer = new StringBuffer("\n");
- childMBeanMemonto.putTextData("cache.jdbc.datasource=" + cacheLoaderConfig.getDataSource());
+ childMBeanMemonto.putTextData("location=" + "location");
}
-
+ else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[6]))
+ {
+ childMBeanMemonto.putTextData("timeout=" + "timeout");
}
- else if (cacheLoaderConfig.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[1]) ||
- cacheLoaderConfig.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[2]))
+ else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[7]))
{
- childMBeanMemonto.putTextData("location=" + cacheLoaderConfig.getFileLocation());
+ childMBeanMemonto.putTextData("\n\t" + "host=" + "host"
+ + "\n" + "\t" + "port=port"+"\n");
}
+ else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[8]))
+ {
+ childMBeanMemonto.putTextData("\n\t" + "host=" + "host"
+ +"\n\t" + "port=port"
+ +"\n\t" + "bindname=bindname"+"/n");
+ }else{
+ childMBeanMemonto.putTextData("timeout=" + "timeout");
}
- childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "CacheLoaderShared");
- childMBeanMemonto.putTextData(Boolean.toString(cacheLoaderConfig.isCacheLoaderShared()));
- childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "CacheLoaderPreload");
- childMBeanMemonto.putTextData(cacheLoaderConfig.getCacheLoaderPreload());
+ childMBeanMemonto = childConfigMemento.createChild("async");
+ childMBeanMemonto.putTextData("false");
- childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "CacheLoaderPassivation");
- childMBeanMemonto.putTextData(Boolean.toString(cacheLoaderConfig.isCacheLoaderPassivation()));
+ childMBeanMemonto = childConfigMemento.createChild("fetchPersistentState");
+ childMBeanMemonto.putTextData("false");
- childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "CacheLoaderFetchPersistentState");
- childMBeanMemonto.putTextData(Boolean.toString(cacheLoaderConfig.isCacheLoaderFetchPersistentState()));
+ childMBeanMemonto = childConfigMemento.createChild("ignoreModifications");
+ childMBeanMemonto.putTextData("false");
+
+ childMBeanMemonto = childConfigMemento.createChild("purgeOnStartup");
+ childMBeanMemonto.putTextData("false");
+ }
+
+ if(cacheConfigModel.isBodyReplicationEnabled()){
childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "CacheLoaderFetchTransientState");
- childMBeanMemonto.putTextData(Boolean.toString(cacheLoaderConfig.isCacheLoaderFetchTransientState()));
+ childMBeanMemonto.putString(ICacheConstants.NAME, "BuddyReplicationConfig");
+
+ childConfigMemento = childMBeanMemonto.createChild(ICacheConstants.CONFIG);
+
+ childMBeanMemonto = childConfigMemento.createChild("buddyReplicationEnabled");
+ childMBeanMemonto.putTextData("false");
+
+ childMBeanMemonto = childConfigMemento.createChild("buddyLocatorClass");
+ childMBeanMemonto.putTextData("org.jboss.cache.buddyreplication.NextMemberBuddyLocator");
+
+ childMBeanMemonto = childConfigMemento.createChild("buddyLocatorProperties");
+ childMBeanMemonto.putTextData("\n\t" + "numBuddies=" + "1"
+ +"\n\t" + "ignoreColocatedBuddies=true"+"\n");
+
+ childMBeanMemonto = childConfigMemento.createChild("buddyPoolName");
+ childMBeanMemonto.putTextData("myBuddyPoolReplicationGroup");
+
+ childMBeanMemonto = childConfigMemento.createChild("buddyCommunicationTimeout");
+ childMBeanMemonto.putTextData("2000");
+
+ childMBeanMemonto = childConfigMemento.createChild("autoDataGravitation");
+ childMBeanMemonto.putTextData("true");
+
+ childMBeanMemonto = childConfigMemento.createChild("dataGravitationRemoveOnFind");
+ childMBeanMemonto.putTextData("false");
+
+ childMBeanMemonto = childConfigMemento.createChild("dataGravitationSearchBackupTrees");
+ childMBeanMemonto.putTextData("true");
+
+ }
childMBeanMemonto = childServerMemonto.createChild(ICacheConstants.ATTRIBUTE);
- childMBeanMemonto.putString(ICacheConstants.NAME, "CacheLoaderAsynchronous");
- childMBeanMemonto.putTextData(Boolean.toString(cacheLoaderConfig.isCacheLoaderAsynchronous()));
+ childMBeanMemonto.putString(ICacheConstants.NAME, "UseInterceptorMbeans");
+ childMBeanMemonto.putTextData(Boolean.toString(cacheConfigModel.isUseInterceptorMBeans()));
memonto.save(writer);
@@ -604,4 +681,69 @@
}
+ public static String[][] getPropertiesForJdbc(boolean isDs) {
+
+ if(isDs){
+ //return only table create
+ return ICacheConstants.CACHE_LOADER_JDBC_TABLE_PARAMS;
+
+ }else{
+ //all paramters
+
+ String[][] temp= new String[11][2];
+
+ System.arraycopy(ICacheConstants.CACHE_LOADER_JDBC_TABLE_PARAMS, 0, temp, 0,ICacheConstants.CACHE_LOADER_JDBC_TABLE_PARAMS.length);
+ System.arraycopy(ICacheConstants.CACHE_LOADER_JDBC_PROPERTIES, 0, temp, 7,ICacheConstants.CACHE_LOADER_JDBC_PROPERTIES.length);
+
+ return temp;
+ }
+
+ }
+
+ public static void main(String[] args) throws Exception{
+ File f = new File("C:/Documents and Settings/Gürkan Erdoðdu/cache.cfg.xml");
+ File f1 = new File("C:/Documents and Settings/Gürkan Erdoðdu/cache1.cfg.xml");
+
+ FileInputStream st = new FileInputStream(f);
+
+ FileOutputStream stro = new FileOutputStream(f1);
+
+ String xx = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
+ byte[] b = new byte[xx.getBytes().length];
+ st.read(b);
+
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+
+ PrintWriter wr = new PrintWriter(stro);
+ wr.println(xx);
+ wr.println("<!DOCTYPE mbean PUBLIC \"-//Cache/Cache Configuration DTD 1.0//EN\" \"http://localhost/cache-configuration-1.0.dtd\">");
+
+ int avail = st.available();
+ byte[] x = new byte[avail];
+
+ while(st.read(x) != -1){
+ os.write(x);
+ }
+
+
+
+
+ wr.print(os.toString().toCharArray());
+
+ wr.flush();
+ wr.close();
+ st.close();
+ os.close();
+ stro.close();
+
+
+
+
+
+
+ }
+
+
+
}//end of class
\ No newline at end of file
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:04
|
User: gurkanerdogdu
Date: 06/07/06 13:17:02
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache
ICacheConstants.java
Added: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache
cache.cfg.xml
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.5 +55 -3 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/ICacheConstants.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ICacheConstants.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/ICacheConstants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ICacheConstants.java 18 Jun 2006 21:12:35 -0000 1.4
+++ ICacheConstants.java 6 Jul 2006 17:17:02 -0000 1.5
@@ -133,9 +133,38 @@
String CACHE_PERSPECTIVE_ID = "org.jboss.ide.eclipse.jbosscache.perspective2";
/**Cache Loader Class */
- String CACHE_LOADER_CLASSES[] = new String[]
- {"org.jboss.cache.loader.JDBCCacheLoader", "org.jboss.cache.loader.FileCacheLoader",
- "org.jboss.cache.loader.BdbjeCacheLoader","None"};
+ String CACHE_LOADER_CLASSES[] = new String[]{"None",
+ "org.jboss.cache.loader.JDBCCacheLoader",
+ "org.jboss.cache.loader.JDBCExtendedCacheLoader",
+ "org.jboss.cache.loader.FileCacheLoader",
+ "org.jboss.cache.loader.bdbje.BdbjeCacheLoader",
+ "org.jboss.cache.loader.jdbm.JdbmCacheLoader",
+ "org.jboss.cache.loader.ClusteredCacheLoader",
+ "org.jboss.cache.loader.tcp.TcpDelegatingCacheLoader",
+ "org.jboss.cache.loader.RmiDelegatingCacheLoader",
+ "org.jboss.cache.loader.RpcDelegatingCacheLoader"};
+
+
+
+ String CACHE_LOADER_JDBC_TABLE_PARAMS[][] = new String[][]{{"cache.jdbc.table.name", "jbosscache"},
+ {"cache.jdbc.table.primarykey", "jbosscache_pk"},
+ {"cache.jdbc.fqn.column", "fqn"},
+ {"cache.jdbc.fqn.type", "varchar(255)"},
+ {"cache.jdbc.node.column", "node"},
+ {"cache.jdbc.node.type", "blob"},
+ {"cache.jdbc.parent.column", "parent"}
+
+ };
+
+
+ String CACHE_LOADER_JDBC_PROPERTIES[][] = new String[][]{{"cache.jdbc.driver", "jdbc_driver"},
+ {"cache.jdbc.url", "url"},
+ {"cache.jdbc.user", "user"},
+ {"cache.jdbc.password", "password"}
+
+};
+
+
/**JDBC Drivers*/
String JDBC_DRIVERS[] = new String[]
@@ -157,6 +186,15 @@
String ISOLATION_LEVELS[] = new String[]
{"NONE", "READ_UNCOMMITTED", "READ_COMMITTED", "REPEATABLE_READ", "SERIALIZABLE"};
+ /**DEFAULT EVICTION POLICY CLASSES*/
+ String EVICTION_POLICY_CLASSES [] = new String[]{"None","org.jboss.cache.TreeCache.LRUPolicy",
+ "org.jboss.cache.TreeCache.FIFOPolicy",
+ "org.jboss.cache.TreeCache.MRUPolicy",
+ "org.jboss.cache.TreeCache.LFUPolicy"};
+
+ /**NODE LOCKING SCHEME*/
+ String NODE_LOCKING_SCHEME []= new String[]{"OPTIMISTIC","PESSIMISTIC"};
+
/**IMAGE PATHS*/
String PLUGIN_IMAGE_PATH = "icons/";
@@ -298,4 +336,18 @@
String[] CACHE_TYPE_MODE = new String[]
{JBOSS_CACHE_TREE_CACHE, JBOSS_CACHE_TREE_CACHE_AOP};
+ String REGION = "region";
+
+String POLICY_CLASS = "policyClass";
+
+String PASSIVATION = "passivation";
+
+String PRELOAD = "preload";
+
+String SHARED ="shared";
+
+String CACHELOADER = "cacheloader";
+
+String CLASS = "class";
+
}//end of interface
\ No newline at end of file
1.1 date: 2006/07/06 17:17:02; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/cache.cfg.xml
Index: cache.cfg.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- ===================================================================== -->
<!-- -->
<!-- Sample TreeCache Service Configuration -->
<!-- -->
<!-- ===================================================================== -->
<server>
<classpath codebase="./lib" archives="jboss-cache.jar, jgroups.jar"/>
<!-- ==================================================================== -->
<!-- Defines TreeCache configuration -->
<!-- ==================================================================== -->
<mbean code="org.jboss.cache.TreeCache"
name="jboss.cache:service=TreeCache">
<depends>jboss:service=Naming</depends>
<depends>jboss:service=TransactionManager</depends>
<!--uncomment next three statements if using JGroups multiplexer in a cluster environment -->
<!--
<depends>jgroups.mux:name=Multiplexer</depends>
<attribute name="MultiplexerService">jgroups.mux:name=Multiplexer</attribute>
<attribute name="MultiplexerStack">fc-fast-minimalthreads</attribute>
-->
<!--
Configure the TransactionManager
-->
<attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
<!--
DataNode locking level : SERIALIZABLE
REPEATABLE_READ (default)
READ_COMMITTED
READ_UNCOMMITTED
NONE
-->
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<!--
Valid modes are LOCAL
REPL_ASYNC
REPL_SYNC
INVALIDATION_ASYNC
INVALIDATION_SYNC
-->
<attribute name="CacheMode">LOCAL</attribute>
<!--
Specifies whether each interceptor should have an associated
mbean registered. Interceptor mbeans are used to capture and display
associated statistics. Statistics can be disabled for individual
interceptors through their mbeans.
-->
<attribute name="UseInterceptorMbeans">true</attribute>
<!--
Just used for async repl: use a replication queue
-->
<attribute name="UseReplQueue">false</attribute>
<!--
Replication interval for replication queue (in ms)
-->
<attribute name="ReplQueueInterval">60000</attribute>
<!--
Max number of elements which trigger replication
-->
<attribute name="ReplQueueMaxElements">100</attribute>
<!-- Name of cluster. Needs to be the same for all clusters, in order
to find each other
-->
<attribute name="ClusterName">TreeCache-Cluster</attribute>
<!-- JGroups protocol stack properties. Can also be a URL,
e.g. file:/home/bela/default.xml
<attribute name="ClusterProperties"></attribute>
-->
<attribute name="ClusterConfig">
<config>
<!-- UDP: if you have a multihomed machine,
set the bind_addr attribute to the appropriate NIC IP address -->
<!-- UDP: On Windows machines, because of the media sense feature
being broken with multicast (even after disabling media sense)
set the loopback attribute to true -->
<UDP mcast_addr="230.8.8.8" mcast_port="56677"
ip_ttl="32" ip_mcast="true"
mcast_send_buf_size="80000" mcast_recv_buf_size="150000"
ucast_send_buf_size="80000" ucast_recv_buf_size="150000"
loopback="false"/>
<PING timeout="2000" num_initial_members="3"
up_thread="false" down_thread="false"/>
<MERGE2 min_interval="10000" max_interval="20000"/>
<FD shun="true" up_thread="true" down_thread="true"/>
<VERIFY_SUSPECT timeout="1500"
up_thread="false" down_thread="false"/>
<pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
max_xmit_size="8192" up_thread="false" down_thread="false"/>
<UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
down_thread="false"/>
<pbcast.STABLE desired_avg_gossip="20000"
up_thread="false" down_thread="false"/>
<FRAG frag_size="8192"
down_thread="false" up_thread="false"/>
<pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
shun="true" print_local_addr="true"/>
<pbcast.STATE_TRANSFER up_thread="false" down_thread="false"/>
</config>
</attribute>
<!--
The max amount of time (in milliseconds) we wait until the
initial state (ie. the contents of the cache) are retrieved from
existing members in a clustered environment.
-->
<attribute name="InitialStateRetrievalTimeout">15000</attribute>
<!--
Number of milliseconds to wait until all responses for a
synchronous call have been received.
-->
<attribute name="SyncReplTimeout">15000</attribute>
<!-- Max number of milliseconds to wait for a lock acquisition -->
<attribute name="LockAcquisitionTimeout">10000</attribute>
<!-- Name of the eviction policy class. Not supported now. -->
<attribute name="EvictionPolicyClass"></attribute>
<!-- New 1.3.x cache loader config block -->
<!--
<attribute name="CacheLoaderConfiguration">
<config>
<passivation>false</passivation>
<preload>/</preload>
<shared>false</shared>
<cacheloader>
<class>org.jboss.cache.loader..bdbje.BdbjeCacheLoader</class>
<properties>
location=/tmp
</properties>
<async>false</async>
<fetchPersistentState>true</fetchPersistentState>
<ignoreModifications>false</ignoreModifications>
</cacheloader>
</config>
</attribute>
-->
<!-- New 1.3.x cache loader config block -->
<!--
<attribute name="CacheLoaderConfiguration">
<config>
<passivation>false</passivation>
<preload>/</preload>
<shared>false</shared>
<cacheloader>
<class>org.jboss.cache.loader.FileCacheLoader</class>
<properties>
location=/tmp
</properties>
<async>false</async>
<fetchPersistentState>true</fetchPersistentState>
<ignoreModifications>false</ignoreModifications>
</cacheloader>
</config>
</attribute>
-->
</mbean>
<!-- Uncomment to bind TreeCache into JNDI as MyCache
<mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
name="mydomain:service=proxyFactory,type=jrmp,target=factory">
<attribute name="InvokerName">jboss:service=invoker,type=jrmp</attribute>
<attribute name="TargetName">jboss.cache:service=TreeCache</attribute>
<attribute name="JndiName">MyCache</attribute>
<attribute name="InvokeTargetMethod">true</attribute>
<attribute name="ExportedInterface">org.jboss.cache.TreeCacheMBean</attribute>
<attribute name="ClientInterceptors">
<iterceptors>
<interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
<interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
<interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
</iterceptors> </attribute>
<depends>jboss:service=invoker,type=jrmp</depends>
<depends>jboss.cache:service=TreeCache</depends>
</mbean>-->
<!-- Uncomment to get a graphical view of the TreeCache MBean above -->
<!-- <mbean code="org.jboss.cache.TreeCacheView" name="jboss.cache:service=TreeCacheView">-->
<!-- <depends>jboss.cache:service=TreeCache</depends>-->
<!-- <attribute name="CacheService">jboss.cache:service=TreeCache</attribute>-->
<!-- </mbean>-->
</server>
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:04
|
User: gurkanerdogdu
Date: 06/07/06 13:17:02
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal
TreeCacheManager.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.2 +1 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/TreeCacheManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCacheManager.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/TreeCacheManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TreeCacheManager.java 13 Dec 2005 16:04:34 -0000 1.1
+++ TreeCacheManager.java 6 Jul 2006 17:17:02 -0000 1.2
@@ -203,7 +203,7 @@
public static Map getListeners(TreeCacheManager manager)
{
- return manager.getTreeCache().getTreeCacheListeners();
+ return (Map)manager.getTreeCache().getTreeCacheListeners();
}
public static void registerClassLoader(TreeCacheManager manager, String region, ClassLoader loader) throws Exception
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:04
|
User: gurkanerdogdu
Date: 06/07/06 13:17:02
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/classpath
CacheVersion124CpContainer.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.2 +1 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/classpath/CacheVersion124CpContainer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheVersion124CpContainer.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/classpath/CacheVersion124CpContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheVersion124CpContainer.java 23 Mar 2006 11:12:31 -0000 1.1
+++ CacheVersion124CpContainer.java 6 Jul 2006 17:17:02 -0000 1.2
@@ -12,7 +12,7 @@
public class CacheVersion124CpContainer extends CacheClassPathContainer
{
public static final String CONTAINER_ID = "org.jboss.ide.eclipse.jbosscache.classpath.CACHE_124";
- public static final String DESCRIPTION = "JBoss Cache 1.2.4 Libraries";
+ public static final String DESCRIPTION = "JBoss Cache Libraries";
protected static final IPath[] cacheJars = new IPath[]{new Path("lib/bsh-2.0b4.jar"),
new Path("lib/commons-logging.jar"),
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:17:04
|
User: gurkanerdogdu
Date: 06/07/06 13:17:02
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages
CacheLoaderConfigurationPage.java
StandardConfigurationPage.java
Added: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages
CacheLoaderLableProvider.java
CopyOfCacheLoaderConfigurationPage.java
CacheLoaderTableProvider.java
Log:
Eclipse 3.2, WTP 1.5 and JBoss Cache 1.4.0 related operaitons.
Revision Changes Path
1.3 +549 -116 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderConfigurationPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderConfigurationPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderConfigurationPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CacheLoaderConfigurationPage.java 24 Mar 2006 13:31:20 -0000 1.2
+++ CacheLoaderConfigurationPage.java 6 Jul 2006 17:17:01 -0000 1.3
@@ -7,11 +7,13 @@
package org.jboss.ide.eclipse.jbosscache.wizards.pages;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -21,7 +23,12 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.widgets.Hyperlink;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
+import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin;
+import org.jboss.ide.eclipse.jbosscache.dialogs.CacheLoaderDefDialog;
/**
* This wizard page configures the class loader of the cache
@@ -31,79 +38,96 @@
{
private Label lblCacheLoaderClass;
+ private Combo cmbCacheLoaderClass;/*Per ClassLoader*/
- private Combo cmbCacheLoaderClass;
-
- private Button chkCacheLoaderShared;
+ private Button chkCacheLoaderShared; /*General*/
+ private Button chkUsePreload;/*General*/
private Label lblCacheLoaderPreload;
+ private Text txtCacheLoaderPreload;/*General*/
- private Text txtCacheLoaderPreload;
-
- private Button chkCacheLoaderPassivation;
-
- private Button chkCacheLoaderFetchPersistentState;
+ private Button chkCacheLoaderPassivation;/*General*/
+ private Button chkCacheLoaderFetchPersistentState;/*Per ClassLoader*/
private Button chkCacheLoaderFetchTransientState;
- private Button chkCacheLoaderAsynchronous;
+ private Button chkCacheLoaderAsynchronous;/*Per ClassLoader*/
/**CacheLoader Config for JDBC */
private Group grpForJdbc;
private Label lblTableName;
-
private Text txtTableName;
private Button chkTableCreate;
-
private Button chkTableDrop;
-
private Label lblFqnColumn;
-
private Text txtFqnColumn;
-
private Label lblFqnType;
-
private Text txtFqnType;
-
private Label lblNodeColumn;
-
private Text txtNodeColumn;
-
private Label lblNodeType;
-
private Text txtNodeType;
-
private Label lblParentColumn;
-
private Text txtParentColumn;
-
private Label lblDriver;
-
private Combo cmbDriver;
-
private Label lblDriverUrl;
-
private Combo cmbDriverUrl;
-
private Label lblUser;
-
private Text txtUser;
-
private Label lblPassword;
-
private Text txtPassword;
-
private Label lblDataSource;
-
private Text txtDataSource;
+ private Button chkIgnoreModifications; /*New in 1.4.0*/
+ private Button chkpurgeOnStartup;/*New in 1.4.0*/
+
+
/**Cache Loader Config For File */
- private Label lblLocation;
+ private Group grpFile;
+ private Label lblLocation;
private Text txtLocation;
+ /**Cache Loader Config For Bdjb*/
+ private Group grpBdjb;
+ private Label lblBdjbLocation;
+ private Text txtBdjbLocation;
+
+ /**Cache Loader Config For Jdbm*/
+ private Group grpJdbm;
+ private Label lblJdbmLocation;
+ private Text txtJdbmLocation;
+
+ /**Cache Loader Config For Cluster*/
+ private Group grpCluster;
+ private Label lblClusterTimeout;
+ private Text txtClusterTimeout;
+
+ /**Cache Loader Config For TcpDel*/
+ private Group grpTcpDel;
+ private Label lblTcpDelHost;
+ private Text txtTcpDelHost;
+ private Label lblTcpDelPort;
+ private Text txtTcpDelPort;
+
+ /**Cache Loader Config For RmiDel*/
+ private Group grpRmiDel;
+ private Label lblRmiDelHost;
+ private Text txtRmiDelHost;
+ private Label lblRmiDelPort;
+ private Text txtRmiDelPort;
+ private Label lblRmiDelBindName;
+ private Text txtRmiDelBindName;
+
+ /**Cache Loader Config For RpcDel*/
+ private Group grpRpcDel;
+ private Label lblRpcDelTimeout;
+ private Text txtRpcDelTimeout;
+
private Button btnUseDataSource;
/**
@@ -129,17 +153,21 @@
}//end of method
+ Group grpContainer;
+
+ Composite container;
+
/**
* Initialize the controls
*/
protected void initializeContent(Composite parent)
{
- Composite container = new Composite(parent, SWT.NONE);
+ container = new Composite(parent, SWT.NONE);
container.setLayout(new GridLayout(1, false));
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- Group grpContainer = new Group(container, SWT.SHADOW_ETCHED_IN);
+ grpContainer = new Group(container, SWT.SHADOW_ETCHED_IN);
grpContainer.setText("Cache Loader Configuration");
grpContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
grpContainer.setLayout(new GridLayout(2, false));
@@ -147,104 +175,387 @@
GridData gridDataForCheck = new GridData(GridData.FILL_HORIZONTAL);
gridDataForCheck.horizontalSpan = 2;
+ chkCacheLoaderPassivation = new Button(grpContainer, SWT.CHECK);
+ chkCacheLoaderPassivation.setText("Cache Loader Passivation");
+ chkCacheLoaderPassivation.setLayoutData(gridDataForCheck);
+
+ chkUsePreload = new Button(grpContainer,SWT.CHECK);
+ chkUsePreload.setText("Use Preload of Below Nodes");
+ chkUsePreload.setLayoutData(gridDataForCheck);
+ chkUsePreload.setSelection(false);
+ chkUsePreload.addSelectionListener(new SelectionAdapter(){
+
+ public void widgetSelected(SelectionEvent e){
+ if(chkUsePreload.getSelection()){
+ lblCacheLoaderPreload.setEnabled(true);
+ txtCacheLoaderPreload.setEnabled(true);
+ }else{
+ lblCacheLoaderPreload.setEnabled(false);
+ txtCacheLoaderPreload.setEnabled(false);
+ }
+ }
+
+ });
+
+
lblCacheLoaderPreload = new Label(grpContainer, SWT.NONE);
lblCacheLoaderPreload.setText("Cache Loader Preload:");
+ lblCacheLoaderPreload.setEnabled(false);
txtCacheLoaderPreload = new Text(grpContainer, SWT.BORDER);
txtCacheLoaderPreload.setText("/");
txtCacheLoaderPreload.setLayoutData(gridData);
+ txtCacheLoaderPreload.setEnabled(false);
chkCacheLoaderShared = new Button(grpContainer, SWT.CHECK);
chkCacheLoaderShared.setText("Cache Loader Shared");
chkCacheLoaderShared.setLayoutData(gridDataForCheck);
- chkCacheLoaderPassivation = new Button(grpContainer, SWT.CHECK);
- chkCacheLoaderPassivation.setText("Cache Loader Passivation");
- chkCacheLoaderPassivation.setLayoutData(gridDataForCheck);
-
- chkCacheLoaderFetchPersistentState = new Button(grpContainer, SWT.CHECK);
- chkCacheLoaderFetchPersistentState.setText("Cache Loader Persistent State");
- chkCacheLoaderFetchPersistentState.setLayoutData(gridDataForCheck);
-
- chkCacheLoaderFetchTransientState = new Button(grpContainer, SWT.CHECK);
- chkCacheLoaderFetchTransientState.setText("Cache Loader Transient State");
- chkCacheLoaderFetchTransientState.setLayoutData(gridDataForCheck);
-
- chkCacheLoaderAsynchronous = new Button(grpContainer, SWT.CHECK);
- chkCacheLoaderAsynchronous.setText("Cache Loader Asyncronous");
- chkCacheLoaderAsynchronous.setLayoutData(gridDataForCheck);
-
lblCacheLoaderClass = new Label(grpContainer, SWT.NONE);
lblCacheLoaderClass.setText("Cache Loader Class:");
cmbCacheLoaderClass = new Combo(grpContainer, SWT.READ_ONLY);
cmbCacheLoaderClass.setItems(ICacheConstants.CACHE_LOADER_CLASSES);
- cmbCacheLoaderClass.select(3);
+ cmbCacheLoaderClass.select(0);
cmbCacheLoaderClass.setLayoutData(gridData);
cmbCacheLoaderClass.addSelectionListener(new SelectionListener()
{
public void widgetSelected(SelectionEvent e)
{
- if (((Combo) e.getSource()).getText().equals(ICacheConstants.CACHE_LOADER_CLASSES[0]))
- {
- lblLocation.setEnabled(false);
- txtLocation.setEnabled(false);
- grpForJdbc.setEnabled(true);
- Control[] childs = grpForJdbc.getChildren();
- for (int i = 0; i < childs.length; i++)
- {
- childs[i].setEnabled(true);
+ // cacheLoaderClassSelected(e,grpContainer);
+// if (((Combo) e.getSource()).getText().equals(ICacheConstants.CACHE_LOADER_CLASSES[0]))
+// {
+// lblLocation.setEnabled(false);
+// txtLocation.setEnabled(false);
+// grpForJdbc.setEnabled(true);
+// Control[] childs = grpForJdbc.getChildren();
+// for (int i = 0; i < childs.length; i++)
+// {
+// childs[i].setEnabled(true);
+// }
+//
+// }
+// else if(((Combo)e.widget).getText().equals(ICacheConstants.CACHE_LOADER_CLASSES[1]) ||
+// ((Combo)e.widget).getText().equals(ICacheConstants.CACHE_LOADER_CLASSES[2]))
+// {
+// grpForJdbc.setEnabled(false);
+// Control[] childs = grpForJdbc.getChildren();
+// for (int i = 0; i < childs.length; i++)
+// {
+// childs[i].setEnabled(false);
+// }
+// lblLocation.setEnabled(true);
+// txtLocation.setEnabled(true);
+// }
+// else
+// {
+// grpForJdbc.setEnabled(false);
+// Control[] childs = grpForJdbc.getChildren();
+// for (int i = 0; i < childs.length; i++)
+// {
+// childs[i].setEnabled(false);
+// }
+// lblLocation.setEnabled(false);
+// txtLocation.setEnabled(false);
+// }
}
- }
- else if(((Combo)e.widget).getText().equals(ICacheConstants.CACHE_LOADER_CLASSES[1]) ||
- ((Combo)e.widget).getText().equals(ICacheConstants.CACHE_LOADER_CLASSES[2]))
- {
- grpForJdbc.setEnabled(false);
- Control[] childs = grpForJdbc.getChildren();
- for (int i = 0; i < childs.length; i++)
+ public void widgetDefaultSelected(SelectionEvent e)
{
- childs[i].setEnabled(false);
- }
- lblLocation.setEnabled(true);
- txtLocation.setEnabled(true);
+
+ //widgetSelected(e);
+// lblLocation.setEnabled(false);
+// txtLocation.setEnabled(false);
+// grpForJdbc.setEnabled(true);
+// Control[] childs = grpForJdbc.getChildren();
+// for (int i = 0; i < childs.length; i++)
+// {
+// childs[i].setEnabled(true);
+// }
}
- else
- {
- grpForJdbc.setEnabled(false);
- Control[] childs = grpForJdbc.getChildren();
- for (int i = 0; i < childs.length; i++)
- {
- childs[i].setEnabled(false);
+
+ });
+
+
+ Hyperlink link = new Hyperlink(grpContainer,SWT.NONE);
+ link.setUnderlined(true);
+ link.setText("Configure ClassLoader...");
+ link.setLayoutData(gridDataForCheck);
+ link.setForeground(JBossCachePlugin.getDisplay().getSystemColor(SWT.COLOR_BLUE));
+ link.addHyperlinkListener(new IHyperlinkListener(){
+
+ public void linkActivated(HyperlinkEvent e) {
+ //Dialog open
+ CacheLoaderDefDialog dialog = new CacheLoaderDefDialog(getShell(),cmbCacheLoaderClass.getText());
+ dialog.open();
}
- lblLocation.setEnabled(false);
- txtLocation.setEnabled(false);
+
+ public void linkEntered(HyperlinkEvent e) {
+
}
+
+ public void linkExited(HyperlinkEvent e) {
+
}
- public void widgetDefaultSelected(SelectionEvent e)
- {
- lblLocation.setEnabled(false);
- txtLocation.setEnabled(false);
- grpForJdbc.setEnabled(true);
- Control[] childs = grpForJdbc.getChildren();
- for (int i = 0; i < childs.length; i++)
- {
- childs[i].setEnabled(true);
+ });
+
+
+ /*deprecated*/
+// chkCacheLoaderFetchTransientState = new Button(grpContainer, SWT.CHECK);
+// chkCacheLoaderFetchTransientState.setText("Cache Loader Transient State");
+// chkCacheLoaderFetchTransientState.setLayoutData(gridDataForCheck);
+
+// chkCacheLoaderAsynchronous = new Button(grpContainer, SWT.CHECK);
+// chkCacheLoaderAsynchronous.setText("Cache Loader Asyncronous");
+// chkCacheLoaderAsynchronous.setLayoutData(gridDataForCheck);
+//
+// chkCacheLoaderFetchPersistentState = new Button(grpContainer, SWT.CHECK);
+// chkCacheLoaderFetchPersistentState.setText("Cache Loader Persistent State");
+// chkCacheLoaderFetchPersistentState.setLayoutData(gridDataForCheck);
+//
+// chkIgnoreModifications = new Button(grpContainer,SWT.CHECK);
+// chkIgnoreModifications.setText("Ignore Modifications");
+// chkIgnoreModifications.setLayoutData(gridDataForCheck);
+//
+// chkpurgeOnStartup = new Button(grpContainer,SWT.CHECK);
+// chkpurgeOnStartup.setText("Purge On Startup");
+// chkpurgeOnStartup.setLayoutData(gridDataForCheck);
+
+// configureForJdbc(grpContainer);
+// grpForJdbc.setVisible(true);
+
+// configureForFile(grpContainer);
+// grpFile.setVisible(false);
+//
+// configureForBdbj(grpContainer);
+// grpBdjb.setVisible(false);
+
+// configureForClustered(grpContainer);
+// grpCluster.setVisible(false);
+//
+// configureForJdbm(grpContainer);
+// grpJdbm.setVisible(false);
+//
+// configureForRmiDel(grpContainer);
+// grpRmiDel.setVisible(false);
+//
+// configureForRpcDel(grpContainer);
+// grpRpcDel.setVisible(false);
+//
+// configureForTcpDel(grpContainer);
+// grpTcpDel.setVisible(false);
+//
+
+// lblLocation = new Label(grpContainer, SWT.NONE);
+// lblLocation.setText("File Location:");
+// txtLocation = new Text(grpContainer, SWT.BORDER);
+// txtLocation.setLayoutData(gridData);
+// lblLocation.setEnabled(false);
+// txtLocation.setEnabled(false);
+
+// GridData gDataForJdbc = new GridData(GridData.FILL_BOTH);
+// gDataForJdbc.horizontalSpan = 2;
+//
+// grpForJdbc = new Group(grpContainer, SWT.SHADOW_ETCHED_IN);
+// grpForJdbc.setText("JDBC Properties");
+// grpForJdbc.setLayoutData(gDataForJdbc);
+// grpForJdbc.setLayout(new GridLayout(2, false));
+//
+// btnUseDataSource = new Button(grpForJdbc,SWT.CHECK);
+// btnUseDataSource.setText("Use DataSource");
+// //btnUseDataSource.setLayoutData(new GridData);
+// btnUseDataSource.addSelectionListener(new SelectionAdapter(){
+// public void widgetSelected(SelectionEvent e){
+// Control[] childs = grpForJdbc.getChildren();
+//
+// if(((Button)e.widget).getSelection()){
+//
+// for (int i = 0; i < childs.length; i++)
+// {
+// Control child = childs[i];
+// if(!child.equals(btnUseDataSource))
+// child.setEnabled(false);
+// }
+//
+// txtDataSource.setEnabled(true);
+// txtDataSource.setEditable(true);
+//
+// }else{
+// for (int i = 0; i < childs.length; i++)
+// {
+// Control child = childs[i];
+// child.setEnabled(true);
+// }
+//
+// txtDataSource.setEditable(false);
+// }
+// }
+// });
+//
+//// lblDataSource = new Label(grpForJdbc, SWT.NONE);
+//// lblDataSource.setText("Data Source:");
+//
+// txtDataSource = new Text(grpForJdbc, SWT.BORDER);
+// txtDataSource.setLayoutData(gridData);
+// txtDataSource.setText("java:/");
+// txtDataSource.setEditable(false);
+//
+// lblTableName = new Label(grpForJdbc, SWT.NONE);
+// lblTableName.setText("Table Name:");
+// txtTableName = new Text(grpForJdbc, SWT.BORDER);
+// txtTableName.setLayoutData(gridData);
+// txtTableName.setText("jbosscache");
+//
+// chkTableCreate = new Button(grpForJdbc, SWT.CHECK);
+// chkTableCreate.setText("Table Create");
+// chkTableCreate.setLayoutData(gridDataForCheck);
+//
+// chkTableDrop = new Button(grpForJdbc, SWT.CHECK);
+// chkTableDrop.setText("Table Drop");
+// chkTableDrop.setLayoutData(gridDataForCheck);
+//
+// lblFqnColumn = new Label(grpForJdbc, SWT.NONE);
+// lblFqnColumn.setText("Fqn Column:");
+// txtFqnColumn = new Text(grpForJdbc, SWT.BORDER);
+// txtFqnColumn.setLayoutData(gridData);
+// txtFqnColumn.setText("fqn");
+//
+// lblFqnType = new Label(grpForJdbc, SWT.NONE);
+// lblFqnType.setText("Fqn Type:");
+// txtFqnType = new Text(grpForJdbc, SWT.BORDER);
+// txtFqnType.setLayoutData(gridData);
+// txtFqnType.setText("varchar(255)");
+//
+// lblNodeColumn = new Label(grpForJdbc, SWT.NONE);
+// lblNodeColumn.setText("Node Column:");
+// txtNodeColumn = new Text(grpForJdbc, SWT.BORDER);
+// txtNodeColumn.setLayoutData(gridData);
+// txtNodeColumn.setText("node");
+//
+// lblNodeType = new Label(grpForJdbc, SWT.NONE);
+// lblNodeType.setText("Node Type:");
+// txtNodeType = new Text(grpForJdbc, SWT.BORDER);
+// txtNodeType.setLayoutData(gridData);
+// txtNodeType.setText("blob");
+//
+// lblParentColumn = new Label(grpForJdbc, SWT.NONE);
+// lblParentColumn.setText("Parent Column:");
+// txtParentColumn = new Text(grpForJdbc, SWT.BORDER);
+// txtParentColumn.setLayoutData(gridData);
+// txtParentColumn.setText("parent");
+//
+// lblDriver = new Label(grpForJdbc, SWT.NONE);
+// lblDriver.setText("Driver Class:");
+// cmbDriver = new Combo(grpForJdbc, SWT.READ_ONLY);
+// cmbDriver.setItems(ICacheConstants.JDBC_DRIVERS);
+// cmbDriver.select(0);
+// cmbDriver.setLayoutData(gridData);
+// cmbDriver.addSelectionListener(new SelectionListener()
+// {
+//
+// public void widgetSelected(SelectionEvent e)
+// {
+// if (((Combo) e.getSource()).getText().equals(ICacheConstants.JDBC_DRIVERS[0]))
+// cmbDriverUrl.select(0);
+// else
+// System.out.println("Another Driver Selection");
+//
+// }
+//
+// public void widgetDefaultSelected(SelectionEvent e)
+// {
+// if (((Combo) e.getSource()).getText().equals(ICacheConstants.JDBC_DRIVERS[0]))
+// cmbDriverUrl.select(0);
+// }
+//
+// });
+//
+// lblDriverUrl = new Label(grpForJdbc, SWT.NONE);
+// lblDriverUrl.setText("Jdbc Url:");
+// cmbDriverUrl = new Combo(grpForJdbc, SWT.NONE);
+// cmbDriverUrl.setItems(ICacheConstants.JDBC_URL_PATTERN);
+// cmbDriverUrl.select(0);
+// cmbDriverUrl.setLayoutData(gridData);
+//
+// lblUser = new Label(grpForJdbc, SWT.NONE);
+// lblUser.setText("User Name:");
+// txtUser = new Text(grpForJdbc, SWT.BORDER);
+// txtUser.setLayoutData(gridData);
+//
+// lblPassword = new Label(grpForJdbc, SWT.NONE);
+// lblPassword.setText("Password:");
+// txtPassword = new Text(grpForJdbc, SWT.BORDER | SWT.PASSWORD);
+// txtPassword.setLayoutData(gridData);
+//
+// /*All controls in Jdbc disable by default */
+// Control[] childs = grpForJdbc.getChildren();
+// for (int i = 0; i < childs.length; i++)
+// {
+// childs[i].setEnabled(false);
+// }
+
+ setControl(container);
+ }//end of method
+
+
+ private void cacheLoaderClassSelected(SelectionEvent e,Group contianer){
+
+ Combo combo = (Combo)e.widget;
+ String clClassText = combo.getText();
+
+ if(clClassText.equals(ICacheConstants.CACHE_LOADER_CLASSES[1]) || clClassText.equals(ICacheConstants.CACHE_LOADER_CLASSES[2])){
+
+ configureForJdbc(contianer);
+ setControl(container);
+
+
+ }else if(clClassText.equals(ICacheConstants.CACHE_LOADER_CLASSES[3])){
+
+ grpForJdbc.setVisible(false);
+ grpFile.setVisible(true);
+ grpBdjb.setVisible(false);
+
+
+ }else if(clClassText.equals(ICacheConstants.CACHE_LOADER_CLASSES[4])){
+
+
+
+ }else if(clClassText.equals(ICacheConstants.CACHE_LOADER_CLASSES[5])){
+
+
+
+ }else if(clClassText.equals(ICacheConstants.CACHE_LOADER_CLASSES[6])){
+
+
+
+ }else if(clClassText.equals(ICacheConstants.CACHE_LOADER_CLASSES[7])){
+
+
+
+ }else if(clClassText.equals(ICacheConstants.CACHE_LOADER_CLASSES[8])){
+
+
+
+ }else{
+
+
+
}
+
+
}
- });
- lblLocation = new Label(grpContainer, SWT.NONE);
- lblLocation.setText("File Location:");
- txtLocation = new Text(grpContainer, SWT.BORDER);
- txtLocation.setLayoutData(gridData);
- lblLocation.setEnabled(false);
- txtLocation.setEnabled(false);
+ private void configureForJdbc(Group grpContainer){
GridData gDataForJdbc = new GridData(GridData.FILL_BOTH);
gDataForJdbc.horizontalSpan = 2;
+ GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+ GridData gridDataForCheck = new GridData(GridData.FILL_HORIZONTAL);
+ gridDataForCheck.horizontalSpan = 2;
+
+
grpForJdbc = new Group(grpContainer, SWT.SHADOW_ETCHED_IN);
grpForJdbc.setText("JDBC Properties");
grpForJdbc.setLayoutData(gDataForJdbc);
@@ -252,7 +563,6 @@
btnUseDataSource = new Button(grpForJdbc,SWT.CHECK);
btnUseDataSource.setText("Use DataSource");
- //btnUseDataSource.setLayoutData(new GridData);
btnUseDataSource.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e){
Control[] childs = grpForJdbc.getChildren();
@@ -281,9 +591,6 @@
}
});
-// lblDataSource = new Label(grpForJdbc, SWT.NONE);
-// lblDataSource.setText("Data Source:");
-
txtDataSource = new Text(grpForJdbc, SWT.BORDER);
txtDataSource.setLayoutData(gridData);
txtDataSource.setText("java:/");
@@ -376,15 +683,65 @@
txtPassword = new Text(grpForJdbc, SWT.BORDER | SWT.PASSWORD);
txtPassword.setLayoutData(gridData);
- /*All controls in Jdbc disable by default */
- Control[] childs = grpForJdbc.getChildren();
- for (int i = 0; i < childs.length; i++)
- {
- childs[i].setEnabled(false);
+
+ }
+
+ private void configureForFile(Group grpContainer){
+
+ GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+
+ GridData gDataForJdbc = new GridData(GridData.FILL_BOTH);
+ gDataForJdbc.horizontalSpan = 2;
+
+ grpFile = new Group(grpContainer, SWT.SHADOW_ETCHED_IN);
+ grpFile.setText("File Properties");
+ grpFile.setLayoutData(gDataForJdbc);
+ grpFile.setLayout(new GridLayout(2, false));
+
+ lblLocation = new Label(grpFile, SWT.NONE);
+ lblLocation.setText("Location:");
+ txtLocation = new Text(grpFile, SWT.BORDER);
+ txtLocation.setLayoutData(gridData);
+
+ }
+
+ private void configureForBdbj(Group grpContainer){
+
+ GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+ GridData gDataForJdbc = new GridData(GridData.FILL_BOTH);
+ gDataForJdbc.horizontalSpan = 2;
+
+ grpBdjb = new Group(grpContainer, SWT.SHADOW_ETCHED_IN);
+ grpBdjb.setText("Bdjb Properties");
+ grpBdjb.setLayoutData(gDataForJdbc);
+ grpBdjb.setLayout(new GridLayout(2, false));
+
+ lblBdjbLocation = new Label(grpBdjb, SWT.NONE);
+ lblBdjbLocation.setText("Location:");
+ txtBdjbLocation = new Text(grpBdjb, SWT.BORDER);
+ txtBdjbLocation.setLayoutData(gridData);
+ }
+
+ private void configureForJdbm(Group grpContainer){
+
+ }
+
+ private void configureForClustered(Group grpContainer){
+
+ }
+
+ private void configureForTcpDel(Group grpContainer){
+
+ }
+
+ private void configureForRmiDel(Group grpContainer){
+
+ }
+
+ private void configureForRpcDel(Group grpContainer){
+
}
- setControl(container);
- }//end of method
public boolean canFlipToNextPage()
{
@@ -755,4 +1112,80 @@
{
return btnUseDataSource;
}
+
+public Button getChkUsePreload() {
+ return chkUsePreload;
+}
+
+public Group getGrpBdjb() {
+ return grpBdjb;
+}
+
+public Group getGrpCluster() {
+ return grpCluster;
+}
+
+public Group getGrpFile() {
+ return grpFile;
+}
+
+public Group getGrpJdbm() {
+ return grpJdbm;
+}
+
+public Group getGrpRmiDel() {
+ return grpRmiDel;
+}
+
+public Group getGrpRpcDel() {
+ return grpRpcDel;
+}
+
+public Group getGrpTcpDel() {
+ return grpTcpDel;
+}
+
+public Text getTxtBdjbLocation() {
+ return txtBdjbLocation;
+}
+
+public Text getTxtClusterTimeout() {
+ return txtClusterTimeout;
+}
+
+public Text getTxtJdbmLocation() {
+ return txtJdbmLocation;
+}
+
+public Text getTxtRmiDelBindName() {
+ return txtRmiDelBindName;
+}
+
+public Text getTxtRmiDelHost() {
+ return txtRmiDelHost;
+}
+
+public Text getTxtRmiDelPort() {
+ return txtRmiDelPort;
+}
+
+public Text getTxtRpcDelTimeout() {
+ return txtRpcDelTimeout;
+}
+
+public Text getTxtTcpDelHost() {
+ return txtTcpDelHost;
+}
+
+public Text getTxtTcpDelPort() {
+ return txtTcpDelPort;
+}
+
+public Button getChkIgnoreModifications() {
+ return chkIgnoreModifications;
+}
+
+public Button getChkpurgeOnStartup() {
+ return chkpurgeOnStartup;
+}
}//end of class
\ No newline at end of file
1.4 +118 -41 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/StandardConfigurationPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StandardConfigurationPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/StandardConfigurationPage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- StandardConfigurationPage.java 18 Jun 2006 21:12:35 -0000 1.3
+++ StandardConfigurationPage.java 6 Jul 2006 17:17:01 -0000 1.4
@@ -34,6 +34,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.forms.widgets.Hyperlink;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.internal.CacheMessages;
import org.jboss.ide.eclipse.jbosscache.model.config.CacheConfigParams;
@@ -52,7 +53,7 @@
private static final String DEFAULT_CACHE_NAME = "Default";
- private static final String DEFAULT_CACHE_XML_FILE_NAME = "treecache_generated_by_jbosscache_ide";
+ private static final String DEFAULT_CACHE_XML_FILE_NAME = "cache.cfg";
private static final String DEFAULT_CACHE_GROUP = "GENERATED_BY_JBOSSCACHE_IDE";
@@ -118,17 +119,27 @@
private Text txtLockAcquisitionTimeout;
- // private Label lblEvictionPolicyClass;
- // private Text txtEvictionPolicyClass;
- // private Label lblNodeLockingScheme;
- // private Combo cmbNodeLockingScheme;
+ private Label lblDefaultEvixctionPolicy;
+
+ private Combo cmbDefaultEvcitionPolicy;/*New in 1.4.0*/
+
+ private Label lblCacheLoaderClass;
+
+ private Combo cmbCacheLoaderClass;
+
+ private Label lblNodeLockingScheme;
+
+ private Combo cmbNodeLockingScheme;/*New in 1.4.0*/
+
+ private Button chkBuddyReplicationEnabled;/*New For 1.4.0*/
+
private Label lblCacheType;
private Combo cmbCacheType;
private Button chkFetchStateOnStartup;
- private Button chkUseInterceptorMBean;
+ private Button chkUseInterceptorMBean;/*New in 1.4.0*/
private CacheConfigParams configParams;
@@ -191,7 +202,7 @@
filePath.setLayout(new GridLayout(3, false));
lblDirectoryName = new Label(filePath, SWT.NONE);
- lblDirectoryName.setText("Directory Name");
+ lblDirectoryName.setText("Directory Name :");
txtDirectoryName = new Text(filePath, SWT.BORDER);
txtDirectoryName.setText(System.getProperty("user.home"));
txtDirectoryName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -225,7 +236,7 @@
txtConfFileName.setLayoutData(gDataForConfText);
grpConfGroup = new Group(container, SWT.SHADOW_ETCHED_IN);
- grpConfGroup.setText("New Cache Configuration");
+ grpConfGroup.setText("New Cache Configuration :");
grpConfGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -235,7 +246,7 @@
grpConfGroup.setLayout(gridLayout);
lblCacheType = new Label(grpConfGroup, SWT.NONE);
- lblCacheType.setText("Cache Type");
+ lblCacheType.setText("Cache Type :");
cmbCacheType = new Combo(grpConfGroup, SWT.READ_ONLY);
cmbCacheType.setItems(ICacheConstants.CACHE_TYPE_MODE);
@@ -243,14 +254,14 @@
cmbCacheType.setLayoutData(gridData);
lblCacheName = new Label(grpConfGroup, SWT.NONE);
- lblCacheName.setText("Cache Name");
+ lblCacheName.setText("Cache Name :");
txtCacheName = new Text(grpConfGroup, SWT.BORDER);
txtCacheName.setText(DEFAULT_CACHE_NAME);
txtCacheName.addModifyListener(this);
txtCacheName.setLayoutData(gridData);
lblCacheMode = new Label(grpConfGroup, SWT.NONE);
- lblCacheMode.setText("Cache Mode:");/*TODO Internationalize for this and remainder !!!*/
+ lblCacheMode.setText("Cache Mode :");/*TODO Internationalize for this and remainder !!!*/
cmbCacheMode = new Combo(grpConfGroup, SWT.READ_ONLY);
cmbCacheMode.setItems(ICacheConstants.CACHE_MODES);
@@ -258,7 +269,7 @@
cmbCacheMode.setLayoutData(gridData);
lblClusterName = new Label(grpConfGroup, SWT.NONE);
- lblClusterName.setText("Cluster Name:");/*TODO Internationalize for this and remainder !!!*/
+ lblClusterName.setText("Cluster Name :");/*TODO Internationalize for this and remainder !!!*/
txtClusterName = new Text(grpConfGroup, SWT.BORDER);
txtClusterName.setText(DEFAULT_CACHE_GROUP);
@@ -266,15 +277,30 @@
txtClusterName.addModifyListener(this);
lblTransactionManager = new Label(grpConfGroup, SWT.NONE);
- lblTransactionManager.setText("Transaction Manager:");/*TODO Internationalize for this and remainder !!!*/
+ lblTransactionManager.setText("Transaction Manager :");/*TODO Internationalize for this and remainder !!!*/
cmbTransactionManager = new Combo(grpConfGroup, SWT.NONE);
cmbTransactionManager.setItems(ICacheConstants.TRANSACTION_MANAGER_LOOKUP_CLASSES);
- cmbTransactionManager.select(1);
+ cmbTransactionManager.select(0);
cmbTransactionManager.setLayoutData(gridData);
+ lblNodeLockingScheme = new Label(grpConfGroup, SWT.NONE);
+ lblNodeLockingScheme.setText("Node Locking Scheme :");
+
+ cmbNodeLockingScheme = new Combo(grpConfGroup, SWT.READ_ONLY);
+ cmbNodeLockingScheme.setItems(ICacheConstants.NODE_LOCKING_SCHEME);
+ cmbNodeLockingScheme.select(1);
+ cmbNodeLockingScheme.setLayoutData(gridData);
+
+ cmbNodeLockingScheme.addSelectionListener(new SelectionAdapter(){
+ public void widgetSelected(SelectionEvent e) {
+ handleNodeSchemeSelected(e);
+ }
+
+ });
+
lblIsolationLevel = new Label(grpConfGroup, SWT.NONE);
- lblIsolationLevel.setText("Isolation Level:");/*TODO Internationalize for this and remainder !!!*/
+ lblIsolationLevel.setText("Isolation Level :");/*TODO Internationalize for this and remainder !!!*/
cmbIsolationLevel = new Combo(grpConfGroup, SWT.READ_ONLY);
cmbIsolationLevel.setItems(ICacheConstants.ISOLATION_LEVELS);
@@ -297,7 +323,7 @@
txtReplicationQueueInterval.addModifyListener(this);
lblReplQueueMaxElements = new Label(grpConfGroup, SWT.NONE);
- lblReplQueueMaxElements.setText("Replication Queue Max Number:");/*TODO Internationalize for this and remainder !!!*/
+ lblReplQueueMaxElements.setText("Replication Queue Max Number :");/*TODO Internationalize for this and remainder !!!*/
txtReplQueueMaxElements = new Text(grpConfGroup, SWT.BORDER);
txtReplQueueMaxElements.setText(DEFAULT_REPL_QUEUE_MAX_NUMBER);
@@ -305,7 +331,7 @@
txtReplQueueMaxElements.addModifyListener(this);
lblInitialStateRetrievalTimeout = new Label(grpConfGroup, SWT.NONE);
- lblInitialStateRetrievalTimeout.setText("Initial State Retrival Timeout:");/*TODO Internationalize for this and remainder !!!*/
+ lblInitialStateRetrievalTimeout.setText("Initial State Retrival Timeout :");/*TODO Internationalize for this and remainder !!!*/
txtInitialStateRetrievalTimeout = new Text(grpConfGroup, SWT.BORDER);
txtInitialStateRetrievalTimeout.setText(DEFAULT_INIT_STATE_RETRV_TIMEOUT);
@@ -314,7 +340,7 @@
txtInitialStateRetrievalTimeout.addModifyListener(this);
lblSyncReplTimeout = new Label(grpConfGroup, SWT.NONE);
- lblSyncReplTimeout.setText("Sync Repl Timeout:");/*TODO Internationalize for this and remainder !!!*/
+ lblSyncReplTimeout.setText("Sync Repl Timeout :");/*TODO Internationalize for this and remainder !!!*/
txtSyncReplTimeout = new Text(grpConfGroup, SWT.BORDER);
txtSyncReplTimeout.setText(DEFAULT_SYNC_REPL_TIMEOUT);
@@ -329,6 +355,26 @@
txtLockAcquisitionTimeout.setLayoutData(gridData);
txtLockAcquisitionTimeout.addModifyListener(this);
+ lblDefaultEvixctionPolicy = new Label(grpConfGroup, SWT.NONE);
+ lblDefaultEvixctionPolicy.setText("Default Eviction Policy :");
+
+ cmbDefaultEvcitionPolicy = new Combo(grpConfGroup,SWT.DROP_DOWN);
+ cmbDefaultEvcitionPolicy.setItems(ICacheConstants.EVICTION_POLICY_CLASSES);
+ cmbDefaultEvcitionPolicy.select(0);
+ cmbDefaultEvcitionPolicy.setLayoutData(gridData);
+
+ lblCacheLoaderClass = new Label(grpConfGroup, SWT.NONE);
+ lblCacheLoaderClass.setText("Default Cache Loader :");
+ cmbCacheLoaderClass = new Combo(grpConfGroup, SWT.DROP_DOWN);
+ cmbCacheLoaderClass.setItems(ICacheConstants.CACHE_LOADER_CLASSES);
+ cmbCacheLoaderClass.select(0);
+ cmbCacheLoaderClass.setLayoutData(gridData);
+
+
+ chkBuddyReplicationEnabled = new Button(grpConfGroup,SWT.CHECK);
+ chkBuddyReplicationEnabled.setText("Buddy Replication Enabled");
+ chkBuddyReplicationEnabled.setLayoutData(gDataForReplicationQueue);
+
chkFetchStateOnStartup = new Button(grpConfGroup, SWT.CHECK);
chkFetchStateOnStartup.setText("Fetch In Memory State");
chkFetchStateOnStartup.setLayoutData(gDataForReplicationQueue);
@@ -338,26 +384,6 @@
chkUseInterceptorMBean.setLayoutData(gDataForReplicationQueue);
chkUseInterceptorMBean.setSelection(true);
- // lblNodeLockingScheme = new Label(grpConfGroup,SWT.NONE);
- // lblNodeLockingScheme.setText("Node Locking Scheme:");/*TODO Internationalize for this and remainder !!!*/
- //
- // cmbNodeLockingScheme = new Combo(grpConfGroup,SWT.READ_ONLY);
- // cmbNodeLockingScheme.setItems(new String[]{"Pessimistic","Optimistic"});
- // cmbNodeLockingScheme.select(0);
- // cmbNodeLockingScheme.setEnabled(false);
- // cmbNodeLockingScheme.setLayoutData(gridData);
- //
- // lblEvictionPolicyClass = new Label(grpConfGroup,SWT.NONE);
- // lblEvictionPolicyClass.setText("Eviction Policy Class:");/*TODO Internationalize for this and remainder !!!*/
- //
- // txtEvictionPolicyClass = new Text(grpConfGroup,SWT.BORDER);
- // txtEvictionPolicyClass.setLayoutData(gridData);
-
- // chkUseMarshalling = new Button(grpConfGroup,SWT.CHECK);
- // chkUseMarshalling.setText("Use Marshalling");
- // chkUseMarshalling.setLayoutData(gDataForReplicationQueue);
- // chkUseMarshalling.setEnabled(false);
- // chkUseMarshalling.setSelection(true);
grpAddJars = new Group(grpConfGroup, SWT.SHADOW_ETCHED_IN);
grpAddJars.setLayout(new GridLayout(3, true));
@@ -609,6 +635,17 @@
return txtDirectoryName.getText().trim();
}
+ private void handleNodeSchemeSelected(SelectionEvent e){
+ Combo nodeScheme = (Combo)e.widget;
+ if(nodeScheme.getSelectionIndex() == 1){
+ lblIsolationLevel.setEnabled(true);
+ cmbIsolationLevel.setEnabled(true);
+ }else{
+ lblIsolationLevel.setEnabled(false);
+ cmbIsolationLevel.setEnabled(false);
+ }
+ }
+
public Text getTxtDirectoryName()
{
return txtDirectoryName;
@@ -708,4 +745,44 @@
return txtConfFileName;
}
+public Button getChkBuddyReplicationEnabled() {
+ return chkBuddyReplicationEnabled;
+}
+
+public Combo getCmbNodeLockingScheme() {
+ return cmbNodeLockingScheme;
+}
+
+public void setCmbNodeLockingScheme(Combo cmbNodeLockingScheme) {
+ this.cmbNodeLockingScheme = cmbNodeLockingScheme;
+}
+
+public Combo getCmbCacheLoaderClass() {
+ return cmbCacheLoaderClass;
+}
+
+public void setCmbCacheLoaderClass(Combo cmbCacheLoaderClass) {
+ this.cmbCacheLoaderClass = cmbCacheLoaderClass;
+}
+
+public Combo getCmbDefaultEvcitionPolicy() {
+ return cmbDefaultEvcitionPolicy;
+}
+
+public void setCmbDefaultEvcitionPolicy(Combo cmbDefaultEvcitionPolicy) {
+ this.cmbDefaultEvcitionPolicy = cmbDefaultEvcitionPolicy;
+}
+
+public Button getChkUseInterceptorMBean() {
+ return chkUseInterceptorMBean;
+}
+
+public void setChkUseInterceptorMBean(Button chkUseInterceptorMBean) {
+ this.chkUseInterceptorMBean = chkUseInterceptorMBean;
+}
+
+public void setChkBuddyReplicationEnabled(Button chkBuddyReplicationEnabled) {
+ this.chkBuddyReplicationEnabled = chkBuddyReplicationEnabled;
+}
+
}//end of class
\ No newline at end of file
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderLableProvider.java
Index: CacheLoaderLableProvider.java
===================================================================
package org.jboss.ide.eclipse.jbosscache.wizards.pages;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.swt.graphics.Image;
import org.jboss.ide.eclipse.jbosscache.model.CacheLoaderPropModel;
public class CacheLoaderLableProvider implements ITableLabelProvider{
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
public String getColumnText(Object element, int columnIndex) {
CacheLoaderPropModel model = (CacheLoaderPropModel)element;
switch (columnIndex) {
case 0:
return model.getProperty();
case 1:
return model.getValue();
}
return null;
}
public void addListener(ILabelProviderListener listener) {
}
public void dispose() {
}
public boolean isLabelProperty(Object element, String property) {
return false;
}
public void removeListener(ILabelProviderListener listener) {
}
}
1.1 date: 2006/07/06 17:17:01; author: gurkanerdogdu; state: Exp;jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CopyOfCacheLoaderConfigurationPage.java
Index: CopyOfCacheLoaderConfigurationPage.java
===================================================================
/*
* JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package org.jboss.ide.eclipse.jbosscache.wizards.pages;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.events.HyperlinkEvent;
import org.eclipse.ui.forms.events.IHyperlinkListener;
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin;
/**
* This wizard page configures the class loader of the cache
* @author Gurkaner
*/
public class CopyOfCacheLoaderConfigurationPage extends WizardPage
{
private Label lblCacheLoaderClass;
private Combo cmbCacheLoaderClass;/*Per ClassLoader*/
private Button chkCacheLoaderShared; /*General*/
private Button chkUsePreload;/*General*/
private Label lblCacheLoaderPreload;
private Text txtCacheLoaderPreload;/*General*/
private Button chkCacheLoaderPassivation;/*General*/
private Button chkCacheLoaderFetchPersistentState;/*Per ClassLoader*/
private Button chkCacheLoaderFetchTransientState;
private Button chkCacheLoaderAsynchronous;/*Per ClassLoader*/
/**CacheLoader Config for JDBC */
private Group grpForJdbc;
private Label lblTableName;
private Text txtTableName;
private Button chkTableCreate;
private Button chkTableDrop;
private Label lblFqnColumn;
private Text txtFqnColumn;
private Label lblFqnType;
private Text txtFqnType;
private Label lblNodeColumn;
private Text txtNodeColumn;
private Label lblNodeType;
private Text txtNodeType;
private Label lblParentColumn;
private Text txtParentColumn;
private Label lblDriver;
private Combo cmbDriver;
private Label lblDriverUrl;
private Combo cmbDriverUrl;
private Label lblUser;
private Text txtUser;
private Label lblPassword;
private Text txtPassword;
private Label lblDataSource;
private Text txtDataSource;
private Button chkIgnoreModifications; /*New in 1.4.0*/
private Button chkpurgeOnStartup;/*New in 1.4.0*/
/**Cache Loader Config For File */
private Group grpFile;
private Label lblLocation;
private Text txtLocation;
/**Cache Loader Config For Bdjb*/
private Group grpBdjb;
private Label lblBdjbLocation;
private Text txtBdjbLocation;
/**Cache Loader Config For Jdbm*/
private Group grpJdbm;
private Label lblJdbmLocation;
private Text txtJdbmLocation;
/**Cache Loader Config For Cluster*/
private Group grpCluster;
private Label lblClusterTimeout;
private Text txtClusterTimeout;
/**Cache Loader Config For TcpDel*/
private Group grpTcpDel;
private Label lblTcpDelHost;
private Text txtTcpDelHost;
private Label lblTcpDelPort;
private Text txtTcpDelPort;
/**Cache Loader Config For RmiDel*/
private Group grpRmiDel;
private Label lblRmiDelHost;
private Text txtRmiDelHost;
private Label lblRmiDelPort;
private Text txtRmiDelPort;
private Label lblRmiDelBindName;
private Text txtRmiDelBindName;
/**Cache Loader Config For RpcDel*/
private Group grpRpcDel;
private Label lblRpcDelTimeout;
private Text txtRpcDelTimeout;
private Button btnUseDataSource;
/**
* Constructor
* @param name
* @param title
* @param imageDesc
*/
public CopyOfCacheLoaderConfigurationPage(String name, String title, ImageDescriptor imageDesc)
{
super(name, title, imageDesc);
setDescription("Cache loader configuration informations");
}//end of method
/**
* Creates the content of the wizard page
* @param Parent of this page
* @return none
*/
public void createControl(Composite parent)
{
initializeContent(parent);
}//end of method
Group grpContainer;
Composite container;
/**
* Initialize the controls
*/
protected void initializeContent(Composite parent)
{
container = new Composite(parent, SWT.NONE);
container.setLayout(new GridLayout(1, false));
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
grpContainer = new Group(container, SWT.SHADOW_ETCHED_IN);
grpContainer.setText("Cache Loader Configuration");
grpContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
grpContainer.setLayout(new GridLayout(2, false));
GridData gridDataForCheck = new GridData(GridData.FILL_HORIZONTAL);
gridDataForCheck.horizontalSpan = 2;
chkCacheLoaderPassivation = new Button(grpContainer, SWT.CHECK);
chkCacheLoaderPassivation.setText("Cache Loader Passivation");
chkCacheLoaderPassivation.setLayoutData(gridDataForCheck);
chkUsePreload = new Button(grpContainer,SWT.CHECK);
chkUsePreload.setText("Use Preload of Below Nodes");
chkUsePreload.setLayoutData(gridDataForCheck);
chkUsePreload.setSelection(false);
chkUsePreload.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e){
if(chkUsePreload.getSelection()){
lblCacheLoaderPreload.setEnabled(true);
txtCacheLoaderPreload.setEnabled(true);
}else{
lblCacheLoaderPreload.setEnabled(false);
txtCacheLoaderPreload.setEnabled(false);
}
}
});
lblCacheLoaderPreload = new Label(grpContainer, SWT.NONE);
lblCacheLoaderPreload.setText("Cache Loader Preload:");
lblCacheLoaderPreload.setEnabled(false);
txtCacheLoaderPreload = new Text(grpContainer, SWT.BORDER);
txtCacheLoaderPreload.setText("/");
txtCacheLoaderPreload.setLayoutData(gridData);
txtCacheLoaderPreload.setEnabled(false);
chkCacheLoaderShared = new Button(grpContainer, SWT.CHECK);
chkCacheLoaderShared.setText("Cache Loader Shared");
chkCacheLoaderShared.setLayoutData(gridDataForCheck);
lblCacheLoaderClass = new Label(grpContainer, SWT.NONE);
lblCacheLoaderClass.setText("Cache Loader Class:");
cmbCacheLoaderClass = new Combo(grpContainer, SWT.READ_ONLY);
cmbCacheLoaderClass.setItems(ICacheConstants.CACHE_LOADER_CLASSES);
cmbCacheLoaderClass.select(0);
cmbCacheLoaderClass.setLayoutData(gridData);
cmbCacheLoaderClass.addSelectionListener(new SelectionListener()
{
public void widgetSelected(SelectionEvent e)
{
// cacheLoaderClassSelected(e,grpContainer);
// if (((Combo) e.getSource()).getText().equals(ICacheConstants.CACHE_LOADER_CLASSES[0]))
// {
// lblLocation.setEnabled(false);
// txtLocation.setEnabled(false);
// grpForJdbc.setEnabled(true);
// Control[] childs = grpForJdbc.getChildren();
// for (int i = 0; i < childs.length; i++)
// {
// childs[i].setEnabled(true);
// }
//
// }
// else if(((Combo)e.widget).getText().equals(ICacheConstants.CACHE_LOADER_CLASSES[1]) ||
// ((Combo)e.widget).getText().equals(ICacheConstants.CACHE_LOADER_CLASSES[2]))
// {
// grpForJdbc.setEnabled(false);
// Control[] childs = grpForJdbc.getChildren();
// for (int i = 0; i < childs.length; i++)
// {
// childs[i].setEnabled(false);
// }
// lblLocation.setEnabled(true);
// txtLocation.setEnabled(true);
// }
// else
// {
// grpForJdbc.setEnabled(false);
// Control[] childs = grpForJdbc.getChildren();
// for (int i = 0; i < childs.length; i++)
// {
// childs[i].setEnabled(false);
// }
// lblLocation.setEnabled(false);
// txtLocation.setEnabled(false);
// }
}
public void widgetDefaultSelected(SelectionEvent e)
{
//widgetSelected(e);
// lblLocation.setEnabled(false);
// txtLocation.setEnabled(false);
// grpForJdbc.setEnabled(true);
// Control[] childs = grpForJdbc.getChildren();
// for (int i = 0; i < childs.length; i++)
// {
// childs[i].setEnabled(true);
// }
}
});
Hyperlink link = new Hyperlink(grpContainer,SWT.NONE);
link.setUnderlined(true);
link.setText("Configure ClassLoader...");
link.setLayoutData(gridDataForCheck);
link.setForeground(JBossCachePlugin.getDisplay().getSystemColor(SWT.COLOR_BLUE));
link.addHyperlinkListener(new IHyperlinkListener(){
public void linkActivated(HyperlinkEvent e) {
//Dialog open
}
public void linkEntered(HyperlinkEvent e) {
}
public void linkExited(HyperlinkEvent e) {
}
});
/*deprecated*/
// chkCacheLoaderFetchTransientState = new Button(grpContainer, SWT.CHECK);
// chkCacheLoaderFetchTransientState.setText("Cache Loader Transient State");
// chkCacheLoaderFetchTransientState.setLayoutData(gridDataForCheck);
// chkCacheLoaderAsynchronous = new Button(grpContainer, SWT.CHECK);
// chkCacheLoaderAsynchronous.setText("Cache Loader Asyncronous");
// chkCacheLoaderAsynchronous.setLayoutData(gridDataForCheck);
//
// chkCacheLoaderFetchPersistentState = new Button(grpContainer, SWT.CHECK);
// chkCacheLoaderFetchPersistentState.setText("Cache Loader Persistent State");
// chkCacheLoaderFetchPersistentState.setLayoutData(gridDataForCheck);
//
// chkIgnoreModifications = new Button(grpContainer,SWT.CHECK);
// chkIgnoreModifications.setText("Ignore Modifications");
// chkIgnoreModifications.setLayoutData(gridDataForCheck);
//
// chkpurgeOnStartup = new Button(grpContainer,SWT.CHECK);
// chkpurgeOnStartup.setText("Purge On Startup");
// chkpurgeOnStartup.setLayoutData(gridDataForCheck);
// configureForJdbc(grpContainer);
// grpForJdbc.setVisible(true);
// configureForFile(grpContainer);
// grpFile.setVisible(false);
//
// configureForBdbj(grpContainer);
// grpBdjb.setVisible(false);
// configureForClustered(grpContainer);
// grpCluster.setVisible(false);
//
// configureForJdbm(grpContainer);
// grpJdbm.setVisible(false);
//
// configureForRmiDel(grpContainer);
// grpRmiDel.setVisible(false);
//
// configureForRpcDel(grpContainer);
// grpRpcDel.setVisible(false);
//
// configureForTcpDel(grpContainer);
// grpTcpDel.setVisible(false);
//
// lblLocation = new Label(grpContainer, SWT.NONE);
// lblLocation.setText("File Location:");
// txtLocation = new Text(grpContainer, SWT.BORDER);
// txtLocation.setLayoutData(gridData);
// lblLocation.setEnabled(false);
// txtLocation.setEnabled(false);
// GridData gDataForJdbc = new GridData(GridData.FILL_BOTH);
// gDataForJdbc.horizontalSpan = 2;
//
// grpForJdbc = new Group(grpContainer, SWT.SHADOW_ETCHED_IN);
// grpForJdbc.setText("JDBC Properties");
// grpForJdbc.setLayoutData(gDataForJdbc);
// grpForJdbc.setLayout(new GridLayout(2, false));
//
// btnUseDataSource = new Button(grpForJdbc,SWT.CHECK);
// btnUseDataSource.setText("Use DataSource");
// //btnUseDataSource.setLayoutData(new GridData);
// btnUseDataSource.addSelectionListener(new SelectionAdapter(){
// public void widgetSelected(SelectionEvent e){
// Control[] childs = grpForJdbc.getChildren();
//
// if(((Button)e.widget).getSelection()){
//
// for (int i = 0; i < childs.length; i++)
// {
// Control child = childs[i];
// if(!child.equals(btnUseDataSource))
// child.setEnabled(false);
// }
//
// txtDataSource.setEnabled(true);
// txtDataSource.setEditable(true);
//
// }else{
// for (int i = 0; i < childs.length; i++)
// {
// Control child = childs[i];
// child.setEnabled(true);
// }
//
// txtDataSource.setEditable(false);
// }
// }
// });
//
//// lblDataSource = new Label(grpForJdbc, SWT.NONE);
//// lblDataSource.setText("Data Source:");
//
// txtDataSource = new Text(grpForJdbc, SWT.BORDER);
// txtDataSource.setLayoutData(gridData);
// txtDataSource.setText("java:/");
// txtDataSource.setEditable(false);
//
// lblTableName = new Label(grpForJdbc, SWT.NONE);
// lblTableName.setText("Table Name:");
// txtTableName = new Text(grpForJdbc, SWT.BORDER);
// txtTableName.setLayoutData(gridData);
// txtTableName.setText("jbosscache");
//
// chkTableCreate = new Button(grpForJdbc, SWT.CHECK);
// chkTableCreate.setText("Table Create");
// chkTableCreate.setLayoutData(gridDataForCheck);
//
// chkTableDrop = new Button(grpForJdbc, SWT.CHECK);
// chkTableDrop.setText("Table Drop");
// chkTableDrop.setLayoutData(gridDataForCheck);
//
// lblFqnColumn = new Label(grpForJdbc, SWT.NONE);
// lblFqnColumn.setText("Fqn Column:");
// txtFqnColumn = new Text(grpForJdbc, SWT.BORDER);
// txtFqnColumn.setLayoutData(gridData);
// txtFqnColumn.setText("fqn");
//
// lblFqnType = new Label(grpForJdbc, SWT.NONE);
// lblFqnType.setText("Fqn Type:");
// txtFqnType = new Text(grpForJdbc, SWT.BORDER);
// txtFqnType.setLayoutData(gridData);
// txtFqnType.setText("varchar(255)");
//
// lblNodeColumn = new Label(grpForJdbc, SWT.NONE);
// lblNodeColumn.setText("Node Column:");
// txtNodeColumn = new Text(grpForJdbc, SWT.BORDER);
// txtNodeColumn.setLayoutData(gridData);
// txtNodeColumn.setText("node");
//
// lblNodeType = new Label(grpForJdbc, SWT.NONE);
// lblNodeType.setText("Node Type:");
// txtNodeType = new Text(grpForJdbc, SWT.BORDER);
// txtNodeType.setLayoutData(gridData);
// txtNodeType.setText("blob");
//
// lblParentColumn = new Label(grpForJdbc, SWT.NONE);
// lblParentColumn.setText("Parent Column:");
// txtParentColumn = new Text(grpForJdbc, SWT.BORDER);
// txtParentColumn.setLayoutData(gridData);
// txtParentColumn.setText("parent");
//
// lblDriver = new Label(grpForJdbc, SWT.NONE);
// lblDriver.setText("Driver Class:");
// cmbDriver = new Combo(grpForJdbc, SWT.READ_ONLY);
// cmbDriver.setItems(ICacheConstants.JDBC_DRIVERS);
// cmbDriver.select(0);
// cmbDriver.setLayoutData(gridDa...
[truncated message content] |
|
From: Marshall C. <mcu...@jb...> - 2006-07-06 17:14:43
|
User: mculpepper
Date: 06/07/06 13:14:42
Modified: releng/org.jboss.ide.eclipse.releng/builders/core
jbosside-core.map
Log:
attempting to make source compilation work
Revision Changes Path
1.9 +1 -1 jbosside/releng/org.jboss.ide.eclipse.releng/builders/core/jbosside-core.map
(In the diff below, changes in quantity of whitespace are not shown.)
Index: jbosside-core.map
===================================================================
RCS file: /cvsroot/jboss/jbosside/releng/org.jboss.ide.eclipse.releng/builders/core/jbosside-core.map,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- jbosside-core.map 2 Jun 2006 23:05:27 -0000 1.8
+++ jbosside-core.map 6 Jul 2006 17:14:42 -0000 1.9
@@ -1,5 +1,5 @@
fe...@or...lipse.feature=%cvsTag%,:pserver:ano...@an...:/cvsroot/jboss,,jbosside/core/features/org.jboss.ide.eclipse.feature
-#fe...@or...urce=%cvsTag%,:pserver:ano...@an...:/cvsroot/jboss,,jbosside/core/features/org.jboss.ide.eclipse.source
+fe...@or...urce=%cvsTag%,:pserver:ano...@an...:/cvsroot/jboss,,jbosside/core/features/org.jboss.ide.eclipse.source
## plugin@org.apache.xalan=%cvsTag%,:pserver:ano...@an...:/cvsroot/jboss,,jbosside/core/plugins/org.apache.xalan
pl...@or...re=%cvsTag%,:pserver:ano...@an...:/cvsroot/jboss,,jbosside/core/plugins/org.jboss.ide.eclipse.core
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-06 17:09:45
|
User: gurkanerdogdu Date: 06/07/06 13:09:42 Log: Directory /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/dtd added to the repository |
|
From: Scott S. <sco...@jb...> - 2006-07-06 17:04:21
|
User: starksm
Date: 06/07/06 13:04:18
Modified: src/main/org/jboss/deployment
ObjectModelFactorySimpleSubDeployerSupport.java
Log:
Make the unmarshal(String, ObjectModelFactory, Object) call explicit to avoid amiguous resolution issues.
Revision Changes Path
1.5 +3 -2 jboss-system/src/main/org/jboss/deployment/ObjectModelFactorySimpleSubDeployerSupport.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ObjectModelFactorySimpleSubDeployerSupport.java
===================================================================
RCS file: /cvsroot/jboss/jboss-system/src/main/org/jboss/deployment/ObjectModelFactorySimpleSubDeployerSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ObjectModelFactorySimpleSubDeployerSupport.java 23 Feb 2006 19:52:16 -0000 1.4
+++ ObjectModelFactorySimpleSubDeployerSupport.java 6 Jul 2006 17:04:18 -0000 1.5
@@ -32,7 +32,7 @@
* deployment's xml file using an ObjectModelFactory.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class ObjectModelFactorySimpleSubDeployerSupport extends SimpleSubDeployerSupport
{
@@ -49,7 +49,8 @@
{
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
ObjectModelFactory factory = getObjectModelFactory();
- di.metaData = unmarshaller.unmarshal(url.toString(), factory, (Object)null);
+ Object root = null;
+ di.metaData = unmarshaller.unmarshal(url.toString(), factory, root);
}
catch (Throwable t)
{
|
|
From: Scott S. <sco...@jb...> - 2006-07-06 17:03:42
|
User: starksm
Date: 06/07/06 13:03:40
Modified: src/main/org/jboss/security/auth/login
XMLLoginConfigImpl.java
Log:
Make the unmarshal(String, ObjectModelFactory, Object) call explicit to avoid amiguous resolution issues.
Revision Changes Path
1.27 +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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- XMLLoginConfigImpl.java 29 Jun 2006 20:55:34 -0000 1.26
+++ XMLLoginConfigImpl.java 6 Jul 2006 17:03:40 -0000 1.27
@@ -62,7 +62,7 @@
@see javax.security.auth.login.Configuration
@author Sco...@jb...
- @version $Revision: 1.26 $
+ @version $Revision: 1.27 $
*/
public class XMLLoginConfigImpl extends Configuration implements Serializable, ApplicationPolicyRegistration
{
@@ -385,7 +385,8 @@
InputStreamReader xmlReader = loadURL(loginConfigURL);
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
unmarshaller.mapFactoryToNamespace(uomf, "http://www.jboss.org/j2ee/schemas/XMLLoginModule");
- PolicyConfig config = (PolicyConfig) unmarshaller.unmarshal(xmlReader, lcomf, (Object)null);
+ Object root = null;
+ PolicyConfig config = (PolicyConfig) unmarshaller.unmarshal(xmlReader, lcomf, root);
configNames.addAll(config.getConfigNames());
appConfigs.copy(config);
}
|
|
From: Scott S. <sco...@jb...> - 2006-07-06 17:03:17
|
User: starksm
Date: 06/07/06 13:03:14
Modified: src/main/org/jboss/deployment Tag: Branch_4_0
ObjectModelFactorySimpleSubDeployerSupport.java
Log:
Make the unmarshal(String, ObjectModelFactory, Object) call explicit to avoid amiguous resolution issues.
Revision Changes Path
No revision
No revision
1.2.2.4 +3 -2 jboss-system/src/main/org/jboss/deployment/ObjectModelFactorySimpleSubDeployerSupport.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ObjectModelFactorySimpleSubDeployerSupport.java
===================================================================
RCS file: /cvsroot/jboss/jboss-system/src/main/org/jboss/deployment/ObjectModelFactorySimpleSubDeployerSupport.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- ObjectModelFactorySimpleSubDeployerSupport.java 29 Oct 2005 05:06:10 -0000 1.2.2.3
+++ ObjectModelFactorySimpleSubDeployerSupport.java 6 Jul 2006 17:03:14 -0000 1.2.2.4
@@ -32,7 +32,7 @@
* deployment's xml file using an ObjectModelFactory.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.2.2.3 $
+ * @version $Revision: 1.2.2.4 $
*/
public abstract class ObjectModelFactorySimpleSubDeployerSupport extends SimpleSubDeployerSupport
{
@@ -49,7 +49,8 @@
{
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
ObjectModelFactory factory = getObjectModelFactory();
- di.metaData = unmarshaller.unmarshal(url.toString(), factory, null);
+ Object root = null;
+ di.metaData = unmarshaller.unmarshal(url.toString(), factory, root);
}
catch (Throwable t)
{
|
185 messages has been excluded from this view by a project administrator.
