JBoss Tools SVN: r43525 - in workspace/akazakov/db/org.jboss.tools.cdi.db: src and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-07 16:09:22 -0400 (Fri, 07 Sep 2012)
New Revision: 43525
Added:
workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/
workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/persistence.xml
Removed:
workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/persistence.xml
Modified:
workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java
Log:
JBIDE-12446
https://issues.jboss.org/browse/JBIDE-12446
Deleted: workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/persistence.xml
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/persistence.xml 2012-09-07 19:56:13 UTC (rev 43524)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/persistence.xml 2012-09-07 20:09:22 UTC (rev 43525)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Persistence deployment descriptor for dev profile -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
- version="2.0">
-
- <persistence-unit name="orgJbossToolsCdiDbEntityManagerFactory" transaction-type="RESOURCE_LOCAL">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
- <!--jta-data-source>java:/orgJbossToolsCommonDbDatasource</jta-data-source-->
- <properties>
- <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.ClientDriver"/>
-
- <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
- <!--property name="hibernate.hbm2ddl.auto" value="update"/-->
- <property name="hibernate.hbm2ddl.auto" value="create">
- <property name="hibernate.show_sql" value="true"/>
- <property name="hibernate.format_sql" value="true"/>
- <!--property name="jboss.entity.manager.factory.jndi.name" value="java:/orgJbossToolsCdiDbEntityManagerFactory"/-->
- </properties>
- </persistence-unit>
-
-</persistence>
\ No newline at end of file
Added: workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/persistence.xml
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/persistence.xml (rev 0)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/persistence.xml 2012-09-07 20:09:22 UTC (rev 43525)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Persistence deployment descriptor for dev profile -->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
+
+ <persistence-unit name="orgJbossToolsCdiDbEntityManagerFactory" transaction-type="RESOURCE_LOCAL">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <!--jta-data-source>java:/orgJbossToolsCommonDbDatasource</jta-data-source-->
+ <properties>
+ <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.ClientDriver"/>
+
+ <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
+ <!--property name="hibernate.hbm2ddl.auto" value="update"/-->
+ <property name="hibernate.hbm2ddl.auto" value="create"/>
+ <property name="hibernate.show_sql" value="true"/>
+ <property name="hibernate.format_sql" value="true"/>
+ <!--property name="jboss.entity.manager.factory.jndi.name" value="java:/orgJbossToolsCdiDbEntityManagerFactory"/-->
+ </properties>
+ </persistence-unit>
+
+</persistence>
\ No newline at end of file
Property changes on: workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/persistence.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java 2012-09-07 19:56:13 UTC (rev 43524)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java 2012-09-07 20:09:22 UTC (rev 43525)
@@ -36,6 +36,10 @@
private Map<String, Short> projects = new HashMap<String, Short>();
private short nextIndex = 0;
+ public CDIDataBase() {
+ CDIDBManager.getInstance().getEntityManager();
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.ICDICache#rebuild(org.jboss.tools.cdi.core.ICDIProject, java.util.Collection)
13 years, 3 months
JBoss Tools SVN: r43524 - in workspace/akazakov/db/org.jboss.tools.common.db/src: org/jboss/tools/common/db and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-07 15:56:13 -0400 (Fri, 07 Sep 2012)
New Revision: 43524
Added:
workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/test/DBManager.java
Removed:
workspace/akazakov/db/org.jboss.tools.common.db/src/META-INF/
workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/DBManager.java
Modified:
workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/CommonDbPlugin.java
workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/test/StartDBAction.java
Log:
https://issues.jboss.org/browse/JBIDE-12446
Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/CommonDbPlugin.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/CommonDbPlugin.java 2012-09-07 19:54:43 UTC (rev 43523)
+++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/CommonDbPlugin.java 2012-09-07 19:56:13 UTC (rev 43524)
@@ -1,8 +1,5 @@
package org.jboss.tools.common.db;
-import java.sql.SQLException;
-
-import org.eclipse.swt.widgets.Display;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.osgi.framework.BundleContext;
@@ -26,21 +23,6 @@
*/
public void start(BundleContext bundleContext) throws Exception {
super.start(bundleContext);
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- try {
- DBManager.getInstance().start();
- } catch (InstantiationException e) {
- logError(e);
- } catch (IllegalAccessException e) {
- logError(e);
- } catch (ClassNotFoundException e) {
- logError(e);
- } catch (SQLException e) {
- logError(e);
- }
- }
- });
}
/*
@@ -48,7 +30,6 @@
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext bundleContext) throws Exception {
- DBManager.getInstance().stop();
super.stop(bundleContext);
}
}
\ No newline at end of file
Deleted: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/DBManager.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/DBManager.java 2012-09-07 19:54:43 UTC (rev 43523)
+++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/DBManager.java 2012-09-07 19:56:13 UTC (rev 43524)
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.db;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
-import org.eclipse.core.runtime.IPath;
-import org.hibernate.ejb.Ejb3Configuration;
-import org.jboss.tools.common.db.test.ModelObject;
-
-/**
- * @author Alexey Kazakov
- */
-public class DBManager {
-
- private static final String entityManagerFactoryName = "orgJbossToolsCommonDbEntityManagerFactory";
- private static final String driver = "org.apache.derby.jdbc.ClientDriver";
- private static final String protocol = "jdbc:derby:";
- private static final String dbName = "DB/derbyDB";
- // String protocol = "jdbc:derby:";
-
- private static DBManager instance = new DBManager();
-
- private static boolean started;
- private String url;
-
- private EntityManagerFactory emf;
-// private EntityManager em;
-
- private DBManager() {
- }
-
- public static DBManager getInstance() {
- return instance;
- }
-
- public synchronized void start() throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException {
- if(started) {
- return;
- }
- CommonDbPlugin.getDefault().getBundle().loadClass(driver).newInstance();
- Properties props = new Properties();
- CommonDbPlugin plugin = CommonDbPlugin.getDefault();
- //The plug-in instance can be null at shutdown, when the plug-in is stopped.
- IPath path = plugin.getStateLocation();
- File file = new File(path.toFile(), dbName); //$NON-NLS-1$
- String location = file.getAbsolutePath();
- url = protocol + location + ";create=true";
- Connection conn = DriverManager.getConnection(url, props);
- conn.close();
- started = true;
- init();
- }
-
- public EntityManager createEntityManager() {
- try {
- start();
- } catch (InstantiationException e) {
- CommonDbPlugin.getDefault().logError(e);
- } catch (IllegalAccessException e) {
- CommonDbPlugin.getDefault().logError(e);
- } catch (ClassNotFoundException e) {
- CommonDbPlugin.getDefault().logError(e);
- } catch (SQLException e) {
- CommonDbPlugin.getDefault().logError(e);
- }
- EntityManager em = emf.createEntityManager();
- return em;
- }
-
- private void init() {
- Map<String, Object> configOverrides = new HashMap<String, Object>();
- configOverrides.put("javax.persistence.jdbc.url", url);
-
-// emf = Persistence.createEntityManagerFactory(entityManagerFactoryName, configOverrides);
-
- Ejb3Configuration cfg = new Ejb3Configuration();
- Ejb3Configuration configured = cfg.configure(entityManagerFactoryName, configOverrides);
- configured.addAnnotatedClass(ModelObject.class);
-// configured.setProperty("javax.persistence.jdbc.driver", driver);
-// configured.setProperty("hibernate.dialect", "org.hibernate.dialect.DerbyDialect");
-// configured.setProperty("hibernate.hbm2ddl.auto", "create");
-// configured.setProperty("hibernate.show_sql", "true");
-// configured.setProperty("hibernate.format_sql", "true");
- emf = configured.buildEntityManagerFactory();
- }
-
- public synchronized void stop() {
- if(!started) {
- return;
- }
- try {
- emf.close();
- DriverManager.getConnection("jdbc:derby:;shutdown=true");
- } catch (SQLException e) {
- if (((e.getErrorCode() != 50000) || (!"XJ015".equals(e.getSQLState()) ))) {
- //"Derby did not shut down normally"
- CommonDbPlugin.getDefault().logError(e);
- } else {
- started = false;
- }
- }
- }
-}
\ No newline at end of file
Copied: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/test/DBManager.java (from rev 43522, workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/DBManager.java)
===================================================================
--- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/test/DBManager.java (rev 0)
+++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/test/DBManager.java 2012-09-07 19:56:13 UTC (rev 43524)
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.db.test;
+
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+import org.eclipse.core.runtime.IPath;
+import org.hibernate.ejb.Ejb3Configuration;
+import org.jboss.tools.common.db.CommonDbPlugin;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class DBManager {
+
+ private static final String entityManagerFactoryName = "orgJbossToolsCommonDbEntityManagerFactory";
+ private static final String driver = "org.apache.derby.jdbc.ClientDriver";
+ private static final String protocol = "jdbc:derby:";
+ private static final String dbName = "DB/derbyDB";
+ // String protocol = "jdbc:derby:";
+
+ private static DBManager instance = new DBManager();
+
+ private static boolean started;
+ private String url;
+
+ private EntityManagerFactory emf;
+// private EntityManager em;
+
+ private DBManager() {
+ }
+
+ public static DBManager getInstance() {
+ return instance;
+ }
+
+ public synchronized void start() throws InstantiationException, IllegalAccessException, ClassNotFoundException, SQLException {
+ if(started) {
+ return;
+ }
+ CommonDbPlugin.getDefault().getBundle().loadClass(driver).newInstance();
+ Properties props = new Properties();
+ CommonDbPlugin plugin = CommonDbPlugin.getDefault();
+ //The plug-in instance can be null at shutdown, when the plug-in is stopped.
+ IPath path = plugin.getStateLocation();
+ File file = new File(path.toFile(), dbName); //$NON-NLS-1$
+ String location = file.getAbsolutePath();
+ url = protocol + location + ";create=true";
+ Connection conn = DriverManager.getConnection(url, props);
+ conn.close();
+ started = true;
+ init();
+ }
+
+ public EntityManager createEntityManager() {
+ try {
+ start();
+ } catch (InstantiationException e) {
+ CommonDbPlugin.getDefault().logError(e);
+ } catch (IllegalAccessException e) {
+ CommonDbPlugin.getDefault().logError(e);
+ } catch (ClassNotFoundException e) {
+ CommonDbPlugin.getDefault().logError(e);
+ } catch (SQLException e) {
+ CommonDbPlugin.getDefault().logError(e);
+ }
+ EntityManager em = emf.createEntityManager();
+ return em;
+ }
+
+ private void init() {
+ Map<String, Object> configOverrides = new HashMap<String, Object>();
+ configOverrides.put("javax.persistence.jdbc.url", url);
+
+// emf = Persistence.createEntityManagerFactory(entityManagerFactoryName, configOverrides);
+
+ Ejb3Configuration cfg = new Ejb3Configuration();
+ Ejb3Configuration configured = cfg.configure(entityManagerFactoryName, configOverrides);
+ configured.addAnnotatedClass(ModelObject.class);
+// configured.setProperty("javax.persistence.jdbc.driver", driver);
+// configured.setProperty("hibernate.dialect", "org.hibernate.dialect.DerbyDialect");
+// configured.setProperty("hibernate.hbm2ddl.auto", "create");
+// configured.setProperty("hibernate.show_sql", "true");
+// configured.setProperty("hibernate.format_sql", "true");
+ emf = configured.buildEntityManagerFactory();
+ }
+
+ public synchronized void stop() {
+ if(!started) {
+ return;
+ }
+ try {
+ emf.close();
+ DriverManager.getConnection("jdbc:derby:;shutdown=true");
+ } catch (SQLException e) {
+ if (((e.getErrorCode() != 50000) || (!"XJ015".equals(e.getSQLState()) ))) {
+ //"Derby did not shut down normally"
+ CommonDbPlugin.getDefault().logError(e);
+ } else {
+ started = false;
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/test/DBManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/test/StartDBAction.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/test/StartDBAction.java 2012-09-07 19:54:43 UTC (rev 43523)
+++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/test/StartDBAction.java 2012-09-07 19:56:13 UTC (rev 43524)
@@ -8,7 +8,6 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.jboss.tools.common.db.DBManager;
public class StartDBAction implements IWorkbenchWindowActionDelegate {
13 years, 3 months
JBoss Tools SVN: r43523 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-09-07 15:54:43 -0400 (Fri, 07 Sep 2012)
New Revision: 43523
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/MarkerProblemAnnotationHoverProcessor.java
Log:
Make CDI Quick Fixes work for As-You-Type validator annotations https://issues.jboss.org/browse/JBIDE-12328
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/MarkerProblemAnnotationHoverProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/MarkerProblemAnnotationHoverProcessor.java 2012-09-07 19:53:51 UTC (rev 43522)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/MarkerProblemAnnotationHoverProcessor.java 2012-09-07 19:54:43 UTC (rev 43523)
@@ -80,6 +80,7 @@
List<AnnotationInfo> all = new ArrayList<AnnotationInfo>();
List<AnnotationInfo> high = new ArrayList<AnnotationInfo>();
List<AnnotationInfo> low = new ArrayList<AnnotationInfo>();
+ List<Annotation> annotations = new ArrayList<Annotation>();
IAnnotationModel model = ((SourceViewer) viewer).getAnnotationModel();
if (model != null) {
@@ -88,15 +89,19 @@
Annotation annotation = (Annotation) iterator.next();
if (!isAnnotationValid(annotation))
continue;
+ if(annotations.contains(annotation))
+ continue;
+ annotations.add(annotation);
Position position = model.getPosition(annotation);
if (position.overlapsWith(hoverRegion.getOffset(), hoverRegion.getLength())) {
AnnotationInfo info = new AnnotationInfo(annotation, position);
- if(info.isTop())
+ if(info.isTop()){
high.add(info);
- else
+ }else{
low.add(info);
+ }
}
}
all.addAll(high);
13 years, 3 months
JBoss Tools SVN: r43522 - workspace/akazakov/db/org.jboss.tools.common.db/src/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-07 15:53:51 -0400 (Fri, 07 Sep 2012)
New Revision: 43522
Modified:
workspace/akazakov/db/org.jboss.tools.common.db/src/META-INF/persistence.xml
Log:
JBIDE-12446
https://issues.jboss.org/browse/JBIDE-12446
Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/META-INF/persistence.xml
===================================================================
--- workspace/akazakov/db/org.jboss.tools.common.db/src/META-INF/persistence.xml 2012-09-07 19:52:31 UTC (rev 43521)
+++ workspace/akazakov/db/org.jboss.tools.common.db/src/META-INF/persistence.xml 2012-09-07 19:53:51 UTC (rev 43522)
@@ -13,7 +13,7 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
<!--property name="hibernate.hbm2ddl.auto" value="update"/-->
- <property name="hibernate.hbm2ddl.auto" value="create">
+ <property name="hibernate.hbm2ddl.auto" value="create"/>
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.format_sql" value="true"/>
<!--property name="jboss.entity.manager.factory.jndi.name" value="java:/orgJbossToolsCommonDbEntityManagerFactory"/-->
13 years, 3 months
JBoss Tools SVN: r43520 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-07 15:47:56 -0400 (Fri, 07 Sep 2012)
New Revision: 43520
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
Log:
Commented out multiple tests - for debugging on Windows
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-07 19:21:43 UTC (rev 43519)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-07 19:47:56 UTC (rev 43520)
@@ -31,18 +31,18 @@
CreateRuntimeFromSOA.class,
NewProjectUsingRuntime.class,
NewProjectUsingBundledInEAP.class,
- Editing.class,
+// Editing.class,
HelloWorld.class,
- HelloWorldAction.class,
- HelloWorldFileAction.class,
- SmooksCSV2XML.class,
- SmooksXML2POJO.class,
- SmooksXML2XMLDateManipulation.class,
- SmooksXML2XMLSimple.class,
- WebServiceConsumer1.class,
- WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
- WebServiceProducerHttp.class,
- WebServiceProducerSocket.class
+// HelloWorldAction.class,
+ HelloWorldFileAction.class
+// SmooksCSV2XML.class,
+// SmooksXML2POJO.class,
+// SmooksXML2XMLDateManipulation.class,
+// SmooksXML2XMLSimple.class,
+// WebServiceConsumer1.class,
+// WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
+// WebServiceProducerHttp.class,
+// WebServiceProducerSocket.class
//SimpleEAPTest.class
})
@RunWith(RequirementAwareSuite.class)
13 years, 3 months
JBoss Tools SVN: r43519 - trunk/esb/tests/org.jboss.tools.esb.validator.test.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-07 15:21:43 -0400 (Fri, 07 Sep 2012)
New Revision: 43519
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
Log:
Added <build> tag
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2012-09-07 19:16:10 UTC (rev 43518)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2012-09-07 19:21:43 UTC (rev 43519)
@@ -16,6 +16,8 @@
<coverage.filter>org.jboss.tools.esb.*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.validator,org.jboss.tools.esb.project.core</emma.instrument.bundles>
</properties>
+
+ <build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -59,5 +61,5 @@
</configuration>
</plugin>
</plugins>
-
+ </build>
</project>
13 years, 3 months
JBoss Tools SVN: r43518 - workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-07 15:16:10 -0400 (Fri, 07 Sep 2012)
New Revision: 43518
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDICache.java
workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF
workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java
workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java
Log:
https://issues.jboss.org/browse/JBIDE-12446
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDICache.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDICache.java 2012-09-07 19:06:44 UTC (rev 43517)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDICache.java 2012-09-07 19:16:10 UTC (rev 43518)
@@ -21,7 +21,7 @@
* @param project
* @param bean
*/
- public void rebuild(ICDIProject project, Collection<IBean> bean);
+ public void rebuild(ICDIProject project, Collection<IBean> beans);
/**
* Returns all beans that has 'legalType' as one of legal types.
@@ -32,4 +32,4 @@
*/
public Collection<IBean> getBeansByLegalType(ICDIProject project, String legalType);
-}
+}
\ No newline at end of file
Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF 2012-09-07 19:06:44 UTC (rev 43517)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/META-INF/MANIFEST.MF 2012-09-07 19:16:10 UTC (rev 43518)
@@ -7,7 +7,8 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jboss.tools.common.db,
- org.jboss.tools.cdi.core
+ org.jboss.tools.cdi.core,
+ org.jboss.tools.common.el.core
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Red Hat, Inc.
Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java 2012-09-07 19:06:44 UTC (rev 43517)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java 2012-09-07 19:16:10 UTC (rev 43518)
@@ -10,25 +10,126 @@
******************************************************************************/
package org.jboss.tools.cdi.db;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDICache;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.db.entity.BeanEntity;
+import org.jboss.tools.cdi.db.entity.QualifierEntity;
+import org.jboss.tools.cdi.db.entity.TypeEntity;
+import org.jboss.tools.common.java.IParametedType;
/**
* @author Alexey Kazakov
*/
-public class CDIDataBase {
+public class CDIDataBase implements ICDICache {
- private static final CDIDataBase INSTANCE = new CDIDataBase();
+ private Map<String, Short> projects = new HashMap<String, Short>();
+ private short nextIndex = 0;
- private CDIDataBase() {
- }
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.ICDICache#rebuild(org.jboss.tools.cdi.core.ICDIProject, java.util.Collection)
+ */
+ @Override
+ public void rebuild(ICDIProject project, Collection<IBean> beans) {
+ Short projectIndex = removeProjectIndex(project);
+ EntityManager em = CDIDBManager.getInstance().getEntityManager();
+ EntityTransaction transaction = em.getTransaction();
+ transaction.begin();
+ if(projectIndex!=null) {
+ em.createQuery("DELETE FROM BeanEntity b WHERE b.projectIndex = :p").setParameter("p", projectIndex).executeUpdate();
+ em.createQuery("DELETE FROM QualifierEntity b WHERE b.projectIndex = :p").setParameter("p", projectIndex).executeUpdate();
+ em.createQuery("DELETE FROM TypeEntity b WHERE b.projectIndex = :p").setParameter("p", projectIndex).executeUpdate();
+ }
+ projectIndex = generateProjectIndex(project);
- public static CDIDataBase getInstance() {
- return INSTANCE;
+ Map<Integer, QualifierEntity> qualifiers = new HashMap<Integer, QualifierEntity>();
+ Map<Integer, TypeEntity> types = new HashMap<Integer, TypeEntity>();
+ for (IBean bean : beans) {
+ BeanEntity beanEntity = new BeanEntity();
+ beanEntity.setIndex(bean.getId());
+ beanEntity.setProjectIndex(projectIndex);
+
+ Collection<IQualifier> beanQualifiers = bean.getQualifiers();
+ List<QualifierEntity> qualifierEntities = new ArrayList<QualifierEntity>();
+ for (IQualifier beanQualifier : beanQualifiers) {
+ int id = beanQualifier.getId();
+ QualifierEntity qualifierEntity = qualifiers.get(id);
+ if(qualifierEntity==null) {
+ qualifierEntity = new QualifierEntity();
+ qualifierEntity.setIndex(id);
+ qualifierEntity.setProjectIndex(projectIndex);
+ em.persist(qualifierEntity);
+ }
+ qualifierEntities.add(qualifierEntity);
+ }
+
+ Collection<IParametedType> beanTypes = bean.getLegalTypes();
+ List<TypeEntity> typeEntities = new ArrayList<TypeEntity>();
+ for (IParametedType beanType : beanTypes) {
+ int id = 0;
+ TypeEntity typeEntity = types.get(id);
+ if(typeEntity==null) {
+ typeEntity = new TypeEntity();
+ typeEntity.setIndex(id);
+ typeEntity.setProjectIndex(projectIndex);
+ em.persist(typeEntity);
+ }
+ typeEntities.add(typeEntity);
+ }
+
+ beanEntity.setQualifiers(qualifierEntities);
+ beanEntity.setTypes(typeEntities);
+ em.persist(beanEntity);
+ }
+ transaction.commit();
}
- public Collection<BeanEntity> getBeans() {
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.ICDICache#getBeansByLegalType(org.jboss.tools.cdi.core.ICDIProject, java.lang.String)
+ */
+ @Override
+ public Collection<IBean> getBeansByLegalType(ICDIProject project, String legalType) {
+ Short projectIndex = getProjectIndex(project);
+ EntityManager em = CDIDBManager.getInstance().getEntityManager();
+ EntityTransaction transaction = em.getTransaction();
+ transaction.begin();
+
+ em.createQuery("DELETE FROM BeanEntity b WHERE b.projectIndex = :p").setParameter("p", projectIndex).executeUpdate();
+
+ transaction.commit();
return null;
}
+
+ private Short getProjectIndex(ICDIProject project) {
+ String projectName = project.getNature().getProject().getName();
+ return projects.get(projectName);
+ }
+
+ private Short removeProjectIndex(ICDIProject project) {
+ String projectName = project.getNature().getProject().getName();
+ Short index = projects.get(projectName);
+ if(index!=null) {
+ projects.remove(projectName);
+ }
+ return index;
+ }
+
+ private short generateProjectIndex(ICDIProject project) {
+ String projectName = project.getNature().getProject().getName();
+ short index = nextIndex;
+ projects.put(projectName, nextIndex++);
+ return index;
+ }
}
\ No newline at end of file
Modified: workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java 2012-09-07 19:06:44 UTC (rev 43517)
+++ workspace/akazakov/db/org.jboss.tools.common.db/src/org/jboss/tools/common/db/AbstractDBManager.java 2012-09-07 19:16:10 UTC (rev 43518)
@@ -98,6 +98,9 @@
return;
}
try {
+ if(em!=null && !em.isOpen()) {
+ em.close();
+ }
emf.close();
DriverManager.getConnection(url);
} catch (SQLException e) {
13 years, 3 months
JBoss Tools SVN: r43517 - in trunk/common: plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-09-07 15:06:44 -0400 (Fri, 07 Sep 2012)
New Revision: 43517
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/quickfix/IQuickFix.java
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
Log:
Make CDI Quick Fixes work for As-You-Type validator annotations https://issues.jboss.org/browse/JBIDE-12328
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/quickfix/IQuickFix.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/quickfix/IQuickFix.java 2012-09-07 19:03:36 UTC (rev 43516)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/quickfix/IQuickFix.java 2012-09-07 19:06:44 UTC (rev 43517)
@@ -11,8 +11,7 @@
package org.jboss.tools.common.quickfix;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.ui.IMarkerResolution2;
-public interface IQuickFix extends IMarkerResolution2, IJavaCompletionProposal{
+public interface IQuickFix extends IBaseMarkerResolution, IJavaCompletionProposal{
}
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java 2012-09-07 19:03:36 UTC (rev 43516)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityMarkerResolution.java 2012-09-07 19:06:44 UTC (rev 43517)
@@ -26,16 +26,15 @@
import org.eclipse.jface.preference.IPreferencePage;
import org.eclipse.jface.preference.PreferenceManager;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.IMarkerResolution2;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.internal.dialogs.WorkbenchPreferenceNode;
import org.eclipse.ui.progress.UIJob;
+import org.jboss.tools.common.quickfix.IBaseMarkerResolution;
import org.jboss.tools.common.ui.CommonUIMessages;
import org.jboss.tools.common.ui.preferences.SeverityPreferencePage;
@@ -43,7 +42,7 @@
* @author Daniel Azarov
*/
public class ConfigureProblemSeverityMarkerResolution implements
- IMarkerResolution2, IJavaCompletionProposal {
+ IBaseMarkerResolution, IJavaCompletionProposal {
private static final int PREFERENCE_SIZE = 40;
private static final String DOTS = "...";
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-07 19:03:36 UTC (rev 43516)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-09-07 19:06:44 UTC (rev 43517)
@@ -1,7 +1,9 @@
package org.jboss.tools.common.base.test;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import junit.framework.Assert;
@@ -167,6 +169,7 @@
if(editor.isDirty()){
editor.doSave(new NullProgressMonitor());
}
+ //editor.dispose();
MarkerResolutionTestUtil.restoreFiles(project, new String[]{fileName});
}
}
@@ -218,7 +221,14 @@
return annotation;
}else{
- TemporaryAnnotation annotation = new TemporaryAnnotation(new Position(offset, length), "type", "message", null, quickFixId);
+ TemporaryAnnotation annotation = new TemporaryAnnotation(new Position(offset, length), TemporaryAnnotation.ANNOT_WARNING, "message", null, quickFixId);
+ Map attributes = new HashMap();
+ attributes.put(TempMarkerManager.AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE, Boolean.TRUE);
+ attributes.put(TempMarkerManager.MESSAGE_ID_ATTRIBUTE_NAME, quickFixId);
+ attributes.put(TempMarkerManager.PREFERENCE_KEY_ATTRIBUTE_NAME, "preferenceKey");
+ attributes.put(TempMarkerManager.PREFERENCE_PAGE_ID_NAME, "pref_page_id");
+ attributes.put(TempMarkerManager.MESSAGE_TYPE_ATTRIBUTE_NAME, JavaMarkerAnnotation.WARNING_ANNOTATION_TYPE);
+ annotation.setAttributes(attributes);
return annotation;
}
13 years, 3 months
JBoss Tools SVN: r43516 - trunk/esb/tests/org.jboss.tools.esb.validator.test.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-07 15:03:36 -0400 (Fri, 07 Sep 2012)
New Revision: 43516
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
Log:
Corrected error in pom - missing <plugins> tag
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2012-09-07 18:38:25 UTC (rev 43515)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2012-09-07 19:03:36 UTC (rev 43516)
@@ -16,7 +16,7 @@
<coverage.filter>org.jboss.tools.esb.*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.esb.core,org.jboss.tools.esb.validator,org.jboss.tools.esb.project.core</emma.instrument.bundles>
</properties>
-
+ <plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
@@ -58,5 +58,6 @@
</environments>
</configuration>
</plugin>
+ </plugins>
</project>
13 years, 3 months