JBoss Tools SVN: r33615 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-04 21:11:35 -0400 (Thu, 04 Aug 2011)
New Revision: 33615
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9462 test failures in org.jboss.tools.cdi.ui.test
removed code that is shutting down JSP indexer
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2011-08-05 00:18:37 UTC (rev 33614)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CDIUIAllTests.java 2011-08-05 01:11:35 UTC (rev 33615)
@@ -49,22 +49,6 @@
// it could be done here because it is not needed to be enabled back
JavaModelManager.getIndexManager().shutdown();
- new Job("Shutodwn what is not needed") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- JSPIndexManager.getDefault().stop();
- } catch (InterruptedException e) {
- // print it and ignore it
- e.printStackTrace();
- }
- JSPFContentPropertiesManager.shutdown();
- JavaCore.removeElementChangedListener(TaglibHelperManager.getInstance());
- TaglibController.shutdown();
- TaglibIndex.shutdown();
- return Status.OK_STATUS;
- }
- }.schedule(3000);
try {
ResourcesUtils.setBuildAutomatically(false);
ValidationFramework.getDefault().suspendAllValidation(true);
14 years, 8 months
JBoss Tools SVN: r33614 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.core: src/org/jboss/tools/cdi/seam/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-04 20:18:37 -0400 (Thu, 04 Aug 2011)
New Revision: 33614
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDIPersistenceConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/plugin.xml
Log:
JBIDE-9400
https://issues.jboss.org/browse/JBIDE-9400
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/plugin.xml 2011-08-05 00:14:24 UTC (rev 33613)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/plugin.xml 2011-08-05 00:18:37 UTC (rev 33614)
@@ -16,6 +16,10 @@
class="org.jboss.tools.cdi.seam.core.international.CDISeamInternationalExtension"
runtime="org.jboss.seam.international.status.TypedStatusMessageBundleExtension">
</cdiextension>
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.core.persistence.CDISeamPersistenceExtension"
+ runtime="org.jboss.seam.persistence.ManagedPersistenceContextExtension">
+ </cdiextension>
</extension>
<extension
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDIPersistenceConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDIPersistenceConstants.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDIPersistenceConstants.java 2011-08-05 00:18:37 UTC (rev 33614)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.cdi.seam.core.persistence;
+
+/**
+ *
+ * @author Viacheslav Kabanlvich
+ *
+ */
+public interface CDIPersistenceConstants {
+ public String EXTENSION_MANAGED_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.ExtensionManaged";
+
+ public String ENTITY_MANAGER_FACTORY_TYPE_NAME = "javax.persistence.EntityManagerFactory";
+ public String ENTITY_MANAGER_TYPE_NAME = "javax.persistence.EntityManager";
+
+ public String SESSION_TYPE_NAME = "org.hibernate.Session";
+ public String SESSION_FACTORY_TYPE_NAME = "org.hibernate.SessionFactory";
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDIPersistenceConstants.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java 2011-08-05 00:18:37 UTC (rev 33614)
@@ -0,0 +1,179 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.cdi.seam.core.persistence;
+
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.CDICoreNature;
+import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension;
+import org.jboss.tools.cdi.core.extension.ICDIExtension;
+import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension;
+import org.jboss.tools.cdi.core.extension.feature.IBuildParticipantFeature;
+import org.jboss.tools.cdi.internal.core.impl.BeanMember;
+import org.jboss.tools.cdi.internal.core.impl.CDIProject;
+import org.jboss.tools.cdi.internal.core.impl.ClassBean;
+import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.cdi.internal.core.scanner.FileSet;
+import org.jboss.tools.cdi.seam.core.CDISeamCorePlugin;
+import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.TypeDeclaration;
+import org.jboss.tools.common.model.XModelObject;
+
+/**
+ *
+ * @author Viacheslav Kabanlvich
+ *
+ */
+public class CDISeamPersistenceExtension implements ICDIExtension, IBuildParticipantFeature {
+ CDICoreNature project;
+ CDISeamPersistenceDefinitionContext context = new CDISeamPersistenceDefinitionContext();
+
+ @Override
+ public void setProject(CDICoreNature n) {
+ project = n;
+ }
+
+ @Override
+ public IDefinitionContextExtension getContext() {
+ return context;
+ }
+
+ @Override
+ public void beginVisiting() {
+ }
+
+ @Override
+ public void visitJar(IPath path, IPackageFragmentRoot root,
+ XModelObject beansXML) {
+ }
+
+ @Override
+ public void visit(IFile file, IPath src, IPath webinf) {
+ }
+
+ @Override
+ public void buildDefinitions() {
+ }
+
+ @Override
+ public void buildDefinitions(FileSet fileSet) {
+ }
+
+ @Override
+ public void buildBeans() {
+ List<TypeDefinition> definitions = project.getAllTypeDefinitions();
+ if(definitions.isEmpty()) {
+ //no beans to build
+ return;
+ }
+ ParametedType entityManager = getType(CDIPersistenceConstants.ENTITY_MANAGER_TYPE_NAME);
+ ParametedType entityManagerFactory = getType(CDIPersistenceConstants.ENTITY_MANAGER_FACTORY_TYPE_NAME);
+ ParametedType session = getType(CDIPersistenceConstants.SESSION_TYPE_NAME);
+ ParametedType sessionFactory = getType(CDIPersistenceConstants.SESSION_FACTORY_TYPE_NAME);
+ if(entityManager == null && session == null) {
+ return;
+ }
+
+ CDIProject cdi = (CDIProject)project.getDelegate();
+
+ for (TypeDefinition def: definitions) {
+ if(def.isVetoed() || !isArtifact(def)) {
+ continue;
+ }
+ ClassBean bean = new ClassBean();
+ bean.setParent(cdi);
+ bean.setDefinition(def);
+ Set<IProducer> ps = bean.getProducers();
+ for (IProducer p: ps) {
+ if(p.getAnnotation(CDIPersistenceConstants.EXTENSION_MANAGED_ANNOTATION_TYPE_NAME) != null) {
+ BeanMember m = (BeanMember)p;
+ TypeDeclaration d = m.getTypeDeclaration();
+
+ ParametedType substitute = null;
+ if(entityManagerFactory != null && entityManager != null && d.getType().equals(entityManagerFactory.getType())) {
+ substitute = entityManager;
+ } else if(sessionFactory != null && session != null && d.getType().equals(sessionFactory.getType())) {
+ substitute = session;
+ }
+
+ if(substitute != null) {
+ d = new TypeDeclaration(substitute, d.getResource(), d.getStartPosition(), d.getLength());
+ m.setTypeDeclaration(d);
+ cdi.addBean(p);
+ }
+ }
+ }
+ }
+ }
+
+ boolean isArtifact(TypeDefinition typeDefinition) {
+ List<FieldDefinition> fs = typeDefinition.getFields();
+ for (FieldDefinition f: fs) {
+ if(isArtefact(f)) {
+ return true;
+ }
+ }
+ List<MethodDefinition> ms = typeDefinition.getMethods();
+ for (MethodDefinition m: ms) {
+ if(isArtefact(m)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ boolean isArtefact(BeanMemberDefinition m) {
+ return m.isAnnotationPresent(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)
+ && m.isAnnotationPresent(CDIPersistenceConstants.EXTENSION_MANAGED_ANNOTATION_TYPE_NAME);
+ }
+
+ private ParametedType getType(String name) {
+ IType t = project.getType(name);
+ if(t == null) {
+ return null;
+ }
+ try {
+ return project.getTypeFactory().getParametedType(t, "L" + name + ";");
+ } catch (JavaModelException e) {
+ CDISeamCorePlugin.getDefault().logError(e);
+ return null;
+ }
+ }
+}
+
+class CDISeamPersistenceDefinitionContext extends AbstractDefinitionContextExtension {
+
+ public CDISeamPersistenceDefinitionContext() {}
+
+ @Override
+ protected AbstractDefinitionContextExtension copy(boolean clean) {
+ CDISeamPersistenceDefinitionContext copy = new CDISeamPersistenceDefinitionContext();
+ copy.root = root;
+ if(!clean) {
+ }
+ return copy;
+ }
+
+ protected void doApplyWorkingCopy() {
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 8 months
JBoss Tools SVN: r33613 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-04 20:14:24 -0400 (Thu, 04 Aug 2011)
New Revision: 33613
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
Log:
JBIDE-9400
https://issues.jboss.org/browse/JBIDE-9400
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-08-04 23:40:41 UTC (rev 33612)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-08-05 00:14:24 UTC (rev 33613)
@@ -96,6 +96,20 @@
}
}
+ /**
+ * These method is used to construct fake members that get all
+ * annotations from this member, but should have another type;
+ * e.g. in implementation of Seam 3 persistence extension.
+ * @param d
+ */
+ public void setTypeDeclaration(TypeDeclaration typeDeclaration) {
+ this.typeDeclaration = typeDeclaration;
+ }
+
+ public TypeDeclaration getTypeDeclaration() {
+ return typeDeclaration;
+ }
+
public IClassBean getClassBean() {
return classBean;
}
14 years, 8 months
JBoss Tools SVN: r33612 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-04 19:40:41 -0400 (Thu, 04 Aug 2011)
New Revision: 33612
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml
Log:
updated for TOOLSDOC-236
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-08-04 23:40:14 UTC (rev 33611)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-08-04 23:40:41 UTC (rev 33612)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
-<pubsnumber>6</pubsnumber>
+<pubsnumber>7</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml 2011-08-04 23:40:14 UTC (rev 33611)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/installation.xml 2011-08-04 23:40:41 UTC (rev 33612)
@@ -246,7 +246,7 @@
* hard nofile 9216
</programlisting>
<para>
- These settings will ensure you do not encounter an error reguarding maximum open files when starting JBoss Developer Studio.
+ These settings will ensure you do not encounter an error regarding maximum open files when starting JBoss Developer Studio.
</para>
<para>
A GUI interface is also necessary for JBoss Developer Studio to run correctly. Either Gnome or KDE are acceptable.
14 years, 8 months
JBoss Tools SVN: r33611 - branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-04 19:40:14 -0400 (Thu, 04 Aug 2011)
New Revision: 33611
Modified:
branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/installation.xml
Log:
updated for TOOLSDOC-236
Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-08-04 23:25:02 UTC (rev 33610)
+++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-08-04 23:40:14 UTC (rev 33611)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
-<pubsnumber>6</pubsnumber>
+<pubsnumber>7</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/installation.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/installation.xml 2011-08-04 23:25:02 UTC (rev 33610)
+++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/installation.xml 2011-08-04 23:40:14 UTC (rev 33611)
@@ -246,7 +246,7 @@
* hard nofile 9216
</programlisting>
<para>
- These settings will ensure you do not encounter an error reguarding maximum open files when starting JBoss Developer Studio.
+ These settings will ensure you do not encounter an error regarding maximum open files when starting JBoss Developer Studio.
</para>
<para>
A GUI interface is also necessary for JBoss Developer Studio to run correctly. Either Gnome or KDE are acceptable.
14 years, 8 months
JBoss Tools SVN: r33610 - trunk/ws/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-04 19:25:02 -0400 (Thu, 04 Aug 2011)
New Revision: 33610
Modified:
trunk/ws/docs/reference/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/ws/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/reference/en-US/Book_Info.xml 2011-08-04 23:24:35 UTC (rev 33609)
+++ trunk/ws/docs/reference/en-US/Book_Info.xml 2011-08-04 23:25:02 UTC (rev 33610)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>6</pubsnumber>
+ <pubsnumber>7</pubsnumber>
<abstract>
<para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
</abstract>
14 years, 8 months
JBoss Tools SVN: r33609 - trunk/ws/docs/soap_reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-04 19:24:35 -0400 (Thu, 04 Aug 2011)
New Revision: 33609
Modified:
trunk/ws/docs/soap_reference/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/ws/docs/soap_reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/soap_reference/en-US/Book_Info.xml 2011-08-04 23:23:45 UTC (rev 33608)
+++ trunk/ws/docs/soap_reference/en-US/Book_Info.xml 2011-08-04 23:24:35 UTC (rev 33609)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>The JBoss SOAP Web Services User Guide explains how to use the JBoss Web Services module to implement SOAP web services in Java.</para>
</abstract>
14 years, 8 months
JBoss Tools SVN: r33608 - branches/jbosstools-3.2.x/ws/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-04 19:23:45 -0400 (Thu, 04 Aug 2011)
New Revision: 33608
Modified:
branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml
Log:
updated for brew
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml 2011-08-04 23:22:35 UTC (rev 33607)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml 2011-08-04 23:23:45 UTC (rev 33608)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>6</pubsnumber>
+ <pubsnumber>7</pubsnumber>
<abstract>
<para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
</abstract>
14 years, 8 months
JBoss Tools SVN: r33607 - trunk/ws/docs/soap_reference/en-US/images.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-04 19:22:35 -0400 (Thu, 04 Aug 2011)
New Revision: 33607
Modified:
trunk/ws/docs/soap_reference/en-US/images/image-jbt-test_JAX-WS_04.png
Log:
updated for TOOLSDOC-233
Modified: trunk/ws/docs/soap_reference/en-US/images/image-jbt-test_JAX-WS_04.png
===================================================================
(Binary files differ)
14 years, 8 months
JBoss Tools SVN: r33606 - trunk/ws/docs/reference/en-US/images.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-08-04 19:21:50 -0400 (Thu, 04 Aug 2011)
New Revision: 33606
Modified:
trunk/ws/docs/reference/en-US/images/image-jbt-test_JAX-WS_04.png
Log:
updated for TOOLSDOC-233
Modified: trunk/ws/docs/reference/en-US/images/image-jbt-test_JAX-WS_04.png
===================================================================
(Binary files differ)
14 years, 8 months