JBoss Tools SVN: r36909 - in trunk/central/plugins/org.jboss.tools.central.discovery: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-02 19:12:28 -0500 (Fri, 02 Dec 2011)
New Revision: 36909
Added:
trunk/central/plugins/org.jboss.tools.central.discovery/images/google_32.png
trunk/central/plugins/org.jboss.tools.central.discovery/images/jrebel_32.png
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
add google and jrebel features to Central (JBDS-1737, JBDS-1946); fix missing overview URLs
Added: trunk/central/plugins/org.jboss.tools.central.discovery/images/google_32.png
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/images/google_32.png (rev 0)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/images/google_32.png 2011-12-03 00:12:28 UTC (rev 36909)
@@ -0,0 +1,41 @@
+�PNG
+
+
+CiCCPICC profile
+V�HU�
+H���(�gA��Z�U\8� ܧ�}z�����������y��&��j
+
+�z��y8�@ ��P�<
+ �%b��0�>�3�o�~��@ ��z�
+��AT�:��������18
+��\��p`���� A�a!:�b��"���"aH4��� �Q"��r��Bj�]H#�-r9�\@���� 2����G1���Q�u@�� �Ơs�t4]���k�� =�����K�ut
+!%�2I IkH�H-�S�>�i�L&�m������ �����O�����:ň�L �$R��J5e?���2B���Qͩ����:�ZIm�vP/S��4u�%͛Cˤ-��Кigi�h/�t� ݃ E�З�k�����w
+�
+��Hb(k{��/�L�ӗ��T0�2�g��oUX*�*|���:�V�~��TUsU?�y� T�U�^V}�FU�P� ��թ U��6��RwR�P�Q_��_���c
+���F��H�Tc���!�2e�XB�rV�,k�Mb[���Lv�v/{LSCs�f�f�f��q�Ʊ��9ٜJ�!�
+�{--?-��j�f�~�7�zھ�b�r�����up�@�,��:m:�u �6�Q����u��>�c�y� ������G�m������� 7046�l18c�̐c�k�i�����h���h��I�'�&�g�5x>f�o b�4�e�k<abi2ۤĤ��)͔k�f�Ѵ�t���,ܬج��9՜k�a�ټ�����E��J�6�ǖږ|��M����V>VyV�VI�\�,�m�WlPW� �:�˶�����v�m���)�)�Sn�1���
+���9�a�%�m�� � �;t;|rtu�vlp���4éĩ��Wgg�s��5�K���v�Sm���n�z˕��ҵ������ܭ�m���=�}��M.��]�=�A���X�q�㝧�����/^v^Y^�� O��&��0m���[��{`:>=e���>�>�z�����"�=�#~�~�~���;�������y��N`������k ��5��/ >B
+Y r�o���c3�g,����Z�0�&L �����~o��L�̶��Gl�� i��})*2�.�Q�Stqt�,֬�Y�g���;�j�rvg�jlRlc웸�����x��E�t$ �����=��s�l�3��T�tc��ܢ����˞w<Y5Y�|8����?� BP/O�nM OE����Q���J<��V��8�;}C�h�OFu�3 OR+y���#�MVD�ެ��q�-9�����R
+i��+�0�(�Of++�
+�y�m������#�s��l�Lѣ�R�PL/�+x[[x�H�HZ�3�f���# �|���P���ظxY��"�E�#�Sw.1]R�dxi��}�h˲��P�XRU�jy��R�ҥ�C+�W4�����n��Z�ca�dU�j��[V*�_�p�����F���WN_�|�ym���J����H��n��Y��J�jA�І�
+���_mJ�t�zj��ʹ���5a5�[̶���6��z�]�V������&�ֿ�w{�� ;��켵+xWk�E}�n��ݏb���~ݸGwOŞ�{�{�E��jtolܯ��� mR6� H:p囀oڛ�w�pZ*�A��'ߦ|{�P������ߙ���Hy+�:�u�-�m�=���茣� ^ G���~�1�cu�5�W���(=��䂓�d���N?=ԙ�y�L��k]Q]�gCϞ?t�L�_�����]�p�"�b�%�K�=�=G~p��H�[o�e���W<�t�M�;����j��s���.]�y�����!
n&� �%���v��w
+�L�]z�x�����������e�m��`�`��Y� �����Ӈ��G�G�#F#���
+��dΓ᧲���~V�y�s������K�X��� ��Ͽ�y��r�:�#� ��y=�����}���ǽ �(�@�P���cǧ�O�>�|��/�����9%
+IDATXå�y���u�?緼�{˼7�7��l �cǎ
+�Y ���`"��$�ڂ��Aji �Y��l� %]�Jd�V*U�Ҍ-"JXK0[p�c{� {<3�����{��86)�P������{����瞯��ƶ 0�����=C�2�T
+�7�_
+���kWq�%�DQ^z� O>�gjFׯ���ezf�v��8�M6�����/�ڻ ��k�����?��|�w;?�[��AK��:�4�e%��CWx ;)�����o��@���q�
+b���\Fo�c�<����]C���죘/D.O�r��E�\�R1�� �#�P)�P�N����ڤ4M��ݵ�B!�Ͽy�:�K��Z� 4��!��u2�(K'�y��Vl�IS4
+�8>Q{���w�=}�Q�1)&���:^� Sm�t2�7.��v���ݭ��=G�9�Z�R{��5���;�M�L�$j�&$�}°N���d�p�i�R�7h֛ 9��)��� ��Z
+f$�d���� ����*��j"���3��8y�c�g�Ϸ94Q[@��p��k��� yw��Aʹ^�DXR�\��ē?Ƶl&�3T*�X��Is��x�;�� �2���� Q y��+�`��{�v����lYׯ�fe��A����<�B�'�8�V#�C���y�O�g_�\�����1Z��hpJRM c����^�+��a�ʢ�5 ]}�Vk>bb��7��b�
+}�>l���qHW)��؈Z�8���qk�2 �3��}�����~���
+{w�b����a���$ڶ�Wa��#r+X}��Y[*y��if x� ct��>H�}8
+ ��6�L:�s�����ƶ ����~LJZ�?�p��;�Ђ
\ No newline at end of file
Added: trunk/central/plugins/org.jboss.tools.central.discovery/images/jrebel_32.png
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/images/jrebel_32.png (rev 0)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/images/jrebel_32.png 2011-12-03 00:12:28 UTC (rev 36909)
@@ -0,0 +1,18 @@
+�PNG
+
+
+�C8pJ^��:�;V��� ��<����b�#`w�]X���l�[Ȩ��d��.fdt�����~ {�q`�_����x�
+��ƨU��E^RV�/��;|X8�_��|+�����"T�*�Ɵ ��Ql��L�r��!����f}�8'q~�fk�, �����
+(h��^Dk{ v�߆_Y������X<�[�+�n��.Y����y #��0��Rlvc���l �#���f����dCS=��ơX6 �R��$:�|�����y��5a� ��H�H �a�T� rd��p�z +�b�!&l�Cj^��P'��m� �BY�v�,�f���%0����
+�}� i�v- �G�3.�
+���',���S �����)��oZ-�����v���.Ľ��hk��*T-Zy_���h���o��.��ZK6L�ذ���p:�
+<j͡�z��a��>�v`�̅ �0t\` ��.�2���EJ�*zx3�G(n�/�$
+��;���Н��u��,Ʀ ,l�B�ϣ�&��Ӵ2��)
+���Yx^�����_# M����A�� �����8���y�'6܄�Gu�#��f�"�"rNl�4�
+(�]d���Z�������?X���;�#5�#y3�����x�A)��6���\��#�<#���\���NX��1 ��dڱq�Ϧ>�Je�h+��^i�W,��;;���� 8'�P��;�� ���)`d�z�%�M���x�6�+�6~Oc���$\z���?I�m�
+��7��T0�x�*�P�=���*݅���T7ˀr�w�~���l\ 0�2�%�� l�h�CIM.=�������j ���xp&q=ʤf �>�#9���t��q�Z�����L�W�NH�U`L<�Dv�9�u!Ӂs� N��Ȩ��0�Xヴj�<�P��@qG�u�F"@ρE�Egg��2셜�%H�Ѓ�C *
+�I)9�� �tB���F�{�Io�8O��DI�;���_� G! ݿǭ��0 CC47c쩌,�Q��C�L� 4�;u;����J�m���\!�UPؑ�( XD���^t��T�7�f���E�jh)/��L:T�|CDTZ�N��2A Vv����MP�tQ�=O�J���v]ؑ�R/7� PRQ@� ��PǨ#ڦCФK P���P�hBM�N�>"`#ƺ��j�O-GQ� .d���[���[$�?��L<��{|7�&��-�~�1��
+�4���K�r�}���/����d��f^�TV;?��T �X@ң��"z'��a��^�����J�J��M��E��j�� �s�ņ'��l|:�c�-P� B�ܐ*H�!
�3<�K�F�s��!�fn�z�뤣�!�D�L= ���)�L�� j�tl�m�W+[A�gq�SvqN���7!�����b��}. ͑,ᢡ��TL��{��9�{�n�x}ܔ�CK�K!��ŠT� �vx�,��7 l�a�?'+��FG��/4�����Y���2k\�5�@����W�|�K��
+����Z����Y�$���!L|���.oDeh,`�D�A��.Դ P�r�v�lӴA�q����q�� �E'�w^�6���
\ No newline at end of file
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-03 00:12:19 UTC (rev 36908)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2011-12-03 00:12:28 UTC (rev 36909)
@@ -63,6 +63,55 @@
</connectorCategory>
<connectorDescriptor
+ categoryId="org.jboss.tools.central.discovery.web"
+ description="Google App Engine for Java 1.6.0 SDK Bundle"
+ id="com.google.appengine.eclipse.sdkbundle.e37.feature"
+ kind="task"
+ license="EPL, Other"
+ name="Google App Engine Java SDK"
+ provider="Google, Inc."
+ siteUrl="http://dl.google.com/eclipse/plugin/3.7/">
+ <icon
+ image32="images/google_32.gif">
+ </icon>
+ <overview
+ url="http://code.google.com/p/google-plugin-for-eclipse/">
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="org.jboss.tools.central.discovery.web"
+ description="Google Web Toolkit 2.4.0 SDK Bundle"
+ id="com.google.gwt.eclipse.sdkbundle.e37.feature"
+ kind="task"
+ license="EPL, Other"
+ name="Google Web Toolkit SDK"
+ provider="Google, Inc."
+ siteUrl="http://dl.google.com/eclipse/plugin/3.7/">
+ <icon
+ image32="images/google_32.gif">
+ </icon>
+ <overview
+ url="http://code.google.com/p/google-plugin-for-eclipse/">
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="org.jboss.tools.central.discovery.testing"
+ description="JRebel Eclipse Plug-in"
+ id="org.zeroturnaround.eclipse.feature"
+ kind="task"
+ license="Commercial"
+ name="JRebel for Eclipse"
+ provider="zeroturnaround.org"
+ siteUrl="http://www.zeroturnaround.com/update-site/">
+ <icon
+ image32="images/jrebel_32.gif">
+ </icon>
+ <overview
+ url="http://zeroturnaround.com/jrebel/current/">
+ </overview>
+ </connectorDescriptor>
+
+ <connectorDescriptor
categoryId="org.jboss.tools.central.discovery.scm"
certificationId="com.jboss.jbds.central.discovery.certification.extras"
description="Eclipse Team Provider for the Subversion version control system"
@@ -76,7 +125,7 @@
image32="images/subclipse_32.gif">
</icon>
<overview
- url="">
+ url="http://subclipse.tigris.org/">
</overview>
</connectorDescriptor>
<connectorDescriptor
@@ -93,7 +142,7 @@
image32="images/pmd_32.png">
</icon>
<overview
- url="">
+ url="http://pmd.sourceforge.net/">
</overview>
</connectorDescriptor>
<connectorDescriptor
@@ -110,7 +159,7 @@
image32="images/findbugs_32.png">
</icon>
<overview
- url="">
+ url="http://findbugs.sourceforge.net/">
</overview>
</connectorDescriptor>
<connectorDescriptor
13 years, 1 month
JBoss Tools SVN: r36908 - trunk/central/features/org.jboss.tools.community.central.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-12-02 19:12:19 -0500 (Fri, 02 Dec 2011)
New Revision: 36908
Modified:
trunk/central/features/org.jboss.tools.community.central.feature/feature.xml
Log:
fix missing missing dep - add org.jboss.tools.community.project.examples.feature as dependency of org.jboss.tools.community.central.feature (JBIDE-10321)
Modified: trunk/central/features/org.jboss.tools.community.central.feature/feature.xml
===================================================================
--- trunk/central/features/org.jboss.tools.community.central.feature/feature.xml 2011-12-02 23:56:43 UTC (rev 36907)
+++ trunk/central/features/org.jboss.tools.community.central.feature/feature.xml 2011-12-03 00:12:19 UTC (rev 36908)
@@ -1,27 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.community.central.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%providerName"
- plugin="org.jboss.tools.community.central">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.jboss.tools.community.central"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.community.central.feature"
+ label="%featureName"
+ version="1.0.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.jboss.tools.community.central">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.jboss.tools.community.project.examples.feature" version="1.2.1.qualifier" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="org.jboss.tools.community.central"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
13 years, 1 month
JBoss Tools SVN: r36907 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-12-02 18:56:43 -0500 (Fri, 02 Dec 2011)
New Revision: 36907
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIFileChange.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java
Log:
EL refactoring for @Named beans doesn't work properly https://issues.jboss.org/browse/JBIDE-10210
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java 2011-12-02 23:48:43 UTC (rev 36906)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java 2011-12-02 23:56:43 UTC (rev 36907)
@@ -102,7 +102,7 @@
ICompilationUnit compilationUnit = original.getWorkingCopy(pm);
TextFileChange fileChange = new CDIFileChange(file.getName(), file);
- if(getEditor(file) != null)
+ if(CDIFileChange.getEditor(file) != null)
fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY);
else
fileChange.setSaveMode(TextFileChange.FORCE_SAVE);
@@ -122,7 +122,7 @@
rootChange.add(fileChange);
}
fileChange = new CDIFileChange(file2.getName(), file2);
- if(getEditor(file2) != null)
+ if(CDIFileChange.getEditor(file2) != null)
fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY);
else
fileChange.setSaveMode(TextFileChange.FORCE_SAVE);
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIFileChange.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIFileChange.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIFileChange.java 2011-12-02 23:56:43 UTC (rev 36907)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * 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.internal.core.refactoring;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+
+public class CDIFileChange extends TextFileChange{
+
+ public CDIFileChange(String name, IFile file) {
+ super(name, file);
+ }
+
+ @Override
+ protected void releaseDocument(final IDocument document, IProgressMonitor pm)
+ throws CoreException {
+ super.releaseDocument(document, pm);
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ IEditorPart editor = getEditor(getFile());
+ if(editor != null){
+ editor.doSave(new NullProgressMonitor());
+ }
+ }
+
+ });
+ }
+
+ public static IEditorPart getEditor(IFile file){
+ IEditorInput ii = EditorUtility.getEditorInput(file);
+
+ IWorkbenchWindow[] windows = CDICorePlugin.getDefault().getWorkbench().getWorkbenchWindows();
+ for(IWorkbenchWindow window : windows){
+ IEditorPart editor = window.getActivePage().findEditor(ii);
+ if(editor != null)
+ return editor;
+ }
+ return null;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIFileChange.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java 2011-12-02 23:48:43 UTC (rev 36906)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java 2011-12-02 23:56:43 UTC (rev 36907)
@@ -16,10 +16,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
@@ -28,11 +25,7 @@
import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
import org.eclipse.ltk.core.refactoring.participants.SharableParticipants;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
import org.jboss.tools.cdi.core.CDICoreMessages;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -64,7 +57,7 @@
rootChange = new CompositeChange(label);
change = new CDIFileChange(file.getName(), file);
- if(getEditor(file) != null)
+ if(CDIFileChange.getEditor(file) != null)
change.setSaveMode(TextFileChange.LEAVE_DIRTY);
else
change.setSaveMode(TextFileChange.FORCE_SAVE);
@@ -75,17 +68,6 @@
rootChange.markAsSynthetic();
}
- protected IEditorPart getEditor(IFile file){
- IEditorInput ii = EditorUtility.getEditorInput(file);
-
- IWorkbenchWindow[] windows = CDICorePlugin.getDefault().getWorkbench().getWorkbenchWindows();
- for(IWorkbenchWindow window : windows){
- IEditorPart editor = window.getActivePage().findEditor(ii);
- if(editor != null)
- return editor;
- }
- return null;
- }
private IClassBean findClassBean(){
CDICoreNature cdiNature = CDICorePlugin.getCDI(file.getProject(), true);
@@ -168,26 +150,4 @@
SharableParticipants sharedParticipants) throws CoreException {
return EMPTY_REF_PARTICIPANT;
}
-
- protected class CDIFileChange extends TextFileChange{
-
- public CDIFileChange(String name, IFile file) {
- super(name, file);
- }
-
- @Override
- protected void releaseDocument(final IDocument document, IProgressMonitor pm)
- throws CoreException {
- super.releaseDocument(document, pm);
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- IEditorPart editor = getEditor(getFile());
- if(editor != null){
- editor.doSave(new NullProgressMonitor());
- }
- }
-
- });
- }
- }
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java 2011-12-02 23:48:43 UTC (rev 36906)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java 2011-12-02 23:56:43 UTC (rev 36907)
@@ -88,7 +88,7 @@
return lastChange;
}
}
- lastChange = new TextFileChange(file.getName(), file);
+ lastChange = new CDIFileChange(file.getName(), file);
MultiTextEdit root = new MultiTextEdit();
lastChange.setEdit(root);
rootChange.add(lastChange);
13 years, 1 month
JBoss Tools SVN: r36906 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal: scanner and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-02 18:48:43 -0500 (Fri, 02 Dec 2011)
New Revision: 36906
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryProxy.java
Log:
JBIDE-10324
https://issues.jboss.org/browse/JBIDE-10324
Storing/loading model for MyFaces tag libraries is fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java 2011-12-02 23:42:41 UTC (rev 36905)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbObject.java 2011-12-02 23:48:43 UTC (rev 36906)
@@ -208,7 +208,7 @@
if(e_id != null) {
String cls = e_id.getAttribute(XMLStoreConstants.ATTR_CLASS);
if(XMLStoreConstants.CLS_STRING.equals(cls)) {
- id = e_id.getAttribute("string"); //$NON-NLS-1$
+ id = e_id.getAttribute(XMLStoreConstants.ATTR_VALUE);
} else if(XMLStoreConstants.CLS_MODEL_OBJECT.equals(cls)) {
id = XMLStoreHelper.loadModelObject(e_id, context);
} else {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2011-12-02 23:42:41 UTC (rev 36905)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2011-12-02 23:48:43 UTC (rev 36906)
@@ -563,7 +563,7 @@
} else {
//consider other cases;
}
- if(tagLib != null && !(tagLib instanceof ICompositeTagLibrary)) {
+ if(tagLib != null && !(tagLib instanceof ICompositeTagLibrary) && !(tagLib instanceof MyFacesTagLibrary)) {
LibraryProxy proxy = new LibraryProxy(tagLib);
proxy.loadXML(library, context);
tagLib = proxy.getLibrary();
@@ -611,7 +611,7 @@
for (ITagLibrary d: fs) {
if(d instanceof ICustomTagLibrary) continue;
AbstractTagLib t = (AbstractTagLib)d;
- if(!(t instanceof ICompositeTagLibrary)) {
+ if(!(t instanceof ICompositeTagLibrary) && !(t instanceof MyFacesTagLibrary)) {
LibraryProxy proxy = new LibraryProxy(t);
proxy.toXML(cse, context);
} else {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryProxy.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryProxy.java 2011-12-02 23:42:41 UTC (rev 36905)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryProxy.java 2011-12-02 23:48:43 UTC (rev 36906)
@@ -46,12 +46,16 @@
public void loadXML(Element element, Properties context) {
super.loadXML(element, context);
- XModelObject o = (XModelObject)getId();
- LoadedDeclarations ds = new XMLScanner().parse(o, getSourcePath(), library.getKbProject());
- if(ds != null && !ds.getLibraries().isEmpty()) {
- library = (AbstractTagLib)ds.getLibraries().get(0);
+ if(getId() instanceof XModelObject) {
+ XModelObject o = (XModelObject)getId();
+ LoadedDeclarations ds = new XMLScanner().parse(o, getSourcePath(), library.getKbProject());
+ if(ds != null && !ds.getLibraries().isEmpty()) {
+ library = (AbstractTagLib)ds.getLibraries().get(0);
+ } else {
+ library = null;
+ }
} else {
- library = null;
+ library.loadXML(element, context);
}
}
}
13 years, 1 month
JBoss Tools SVN: r36905 - trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-02 18:42:41 -0500 (Fri, 02 Dec 2011)
New Revision: 36905
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java
Log:
JBIDE-10324
https://issues.jboss.org/browse/JBIDE-10324
Test for reload of kb model, that emulates restart of Eclipse.
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java 2011-12-02 21:42:23 UTC (rev 36904)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java 2011-12-02 23:42:41 UTC (rev 36905)
@@ -15,6 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.internal.KbProject;
import org.jboss.tools.jst.web.kb.internal.taglib.myfaces.MyFacesTagLibrary;
import org.jboss.tools.jst.web.kb.taglib.IComponent;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
@@ -81,4 +82,10 @@
}
+ public void testReload() {
+ IKbProject kbProject = getKbProject();
+ ((KbProject)kbProject).reload();
+ testKbProjectObjects();
+ }
+
}
\ No newline at end of file
13 years, 1 month
JBoss Tools SVN: r36904 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/console and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-12-02 16:42:23 -0500 (Fri, 02 Dec 2011)
New Revision: 36904
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java
Log:
OPEN - issue JBIDE-10152: enable console for openshift server rhc-tailfiles
https://issues.jboss.org/browse/JBIDE-10152
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-12-02 21:39:58 UTC (rev 36903)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-12-02 21:42:23 UTC (rev 36904)
@@ -146,7 +146,7 @@
<!-- Extensions to Server View to provide 'tail' of the remote server.log file -->
- <!-- disabled for now
+ <!-- disabled for now
<extension point="org.eclipse.ui.navigator.navigatorContent">
<actionProvider
class="org.jboss.tools.openshift.express.internal.ui.console.TailServerLogActionProvider"
@@ -186,5 +186,6 @@
type="org.eclipse.wst.server.core.IServer">
</propertyTester>
</extension>
+
-->
</plugin>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2011-12-02 21:39:58 UTC (rev 36903)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2011-12-02 21:42:23 UTC (rev 36904)
@@ -5,18 +5,16 @@
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.RemoteSession;
import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.util.FS;
-import org.eclipse.jsch.core.IJSchService;
-import org.eclipse.jsch.internal.core.JSchLocation;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.console.IConsoleConstants;
import org.eclipse.ui.console.MessageConsole;
@@ -27,18 +25,12 @@
import org.eclipse.wst.server.ui.IServerModule;
import org.jboss.tools.openshift.express.internal.client.utils.Base64Encoder;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
-import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.console.TailServerLogWorker.MyLogger;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.utils.Logger;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import com.jcraft.jsch.Channel;
-import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
public class TailServerLogAction extends Action implements ISelectionChangedListener {
@@ -72,8 +64,8 @@
if (!tailRunners.containsKey(serverId)) {
TailServerLogWorker tailServerLogRunner;
try {
- final Channel channel = initSshChannel(server);
- tailServerLogRunner = new TailServerLogWorker(server, console, channel);
+ final Process process = startTailProcess(server);
+ tailServerLogRunner = new TailServerLogWorker(server, console, process);
tailRunners.put(serverId, tailServerLogRunner);
Thread thread = new Thread(tailServerLogRunner);
thread.start();
@@ -85,7 +77,7 @@
}
}
- private Channel initSshChannel(IServer server) throws JSchException, IOException {
+ private Process startTailProcess(IServer server) throws JSchException, IOException {
final String host = server.getHost();
final String appId = ExpressServerUtils.getExpressApplicationId(server);
final String appName = ExpressServerUtils.getExpressApplicationName(server);
@@ -95,29 +87,15 @@
JSch.setLogger(new MyLogger());
final SshSessionFactory sshSessionFactory = SshSessionFactory.getInstance();
- final URIish uri = new URIish();
- uri.setHost(host);
- uri.setUser(appId);
- final FS local = FS.detect();
- final RemoteSession remoteSession = sshSessionFactory.getSession(uri, null, local, 100000);
+ final URIish uri = new URIish().setHost(host).setUser(appId);
+ final RemoteSession remoteSession = sshSessionFactory.getSession(uri, CredentialsProvider.getDefault(), FS.DETECTED, 100000);
- //BundleContext context = OpenShiftUIActivator.getDefault().getBundle().getBundleContext();
- //final ServiceReference<IJSchService> ssh = context.getServiceReference(IJSchService.class);
- //final IJSchService jschService = context.getService(ssh);
- // when the createSession method below take a null UserInfo param, it creates a new one that can't be initialized here (not a public class)
- //final Session session = jschService.createSession(new JSchLocation(appId, host), null);
- //jschService.connect(session, 0, new NullProgressMonitor());
-
// the rhc-tail-files command template
// ssh_cmd =
// "ssh -t #{app_uuid}(a)#{app}-#{namespace}.#{rhc_domain} 'tail#{opt['opts'] ? ' --opts ' + Base64::encode64(opt['opts']).chomp : ''} #{file_glob}'"
final String command = buildCommand(logFilePath, options);
Process process = remoteSession.exec(command, 0);
- //final Channel channel = session.openChannel("exec");
- //((ChannelExec) channel).setCommand(command);
- //channel.connect();
- //return channel;
- return null;
+ return process;
}
private String buildCommand(final String filePath, final String options) throws UnsupportedEncodingException {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java 2011-12-02 21:39:58 UTC (rev 36903)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java 2011-12-02 21:42:23 UTC (rev 36904)
@@ -7,60 +7,41 @@
import org.eclipse.ui.console.MessageConsole;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.tools.openshift.express.internal.client.utils.Base64Encoder;
-import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
-import com.jcraft.jsch.Channel;
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Logger;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.UserInfo;
public class TailServerLogWorker implements Runnable {
private final IServer server;
- private final Session session;
+ private final Process process;
- private final Channel channel;
-
private final MessageConsole console;
- public TailServerLogWorker(final IServer server, final MessageConsole console, final Channel channel) throws UnsupportedEncodingException,
+ public TailServerLogWorker(final IServer server, final MessageConsole console, final Process process) throws UnsupportedEncodingException,
JSchException {
this.server = server;
this.console = console;
- this.channel = channel;
- this.session = channel.getSession();
+ this.process = process;
}
@Override
public void run() {
try {
// get I/O streams for remote tail
- final InputStream in = channel.getInputStream();
+ final InputStream in = process.getInputStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
String line;
// Read File Line By Line
while ((line = reader.readLine()) != null) {
console.newMessageStream().println(line);
}
- if (!session.isConnected()) {
- org.jboss.tools.openshift.express.internal.utils.Logger.warn("Session closed");
-
- }
- if (channel.isClosed()) {
- org.jboss.tools.openshift.express.internal.utils.Logger.warn("Channel closed with exit status "
- + channel.getExitStatus());
- }
} catch (Throwable e) {
org.jboss.tools.openshift.express.internal.utils.Logger.error(
"Error while receiving the remote server log", e);
} finally {
- org.jboss.tools.openshift.express.internal.utils.Logger.warn("Disconnecting from the remote server log");
- session.disconnect();
+
}
}
13 years, 1 month
JBoss Tools SVN: r36903 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-12-02 16:39:58 -0500 (Fri, 02 Dec 2011)
New Revision: 36903
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java
Log:
Fixed typo in Wizard title noticed by Burr
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2011-12-02 20:03:22 UTC (rev 36902)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2011-12-02 21:39:58 UTC (rev 36903)
@@ -69,7 +69,7 @@
public ArchetypeExamplesWizard(File location, Project projectDescription) {
super();
- setWindowTitle("New JBoss project");
+ setWindowTitle("New JBoss Project");
setDefaultPageImageDescriptor(MavenProjectExamplesActivator.getNewWizardImageDescriptor());
setNeedsProgressMonitor(true);
this.projectDescription = projectDescription;
13 years, 1 month
JBoss Tools SVN: r36902 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-12-02 15:03:22 -0500 (Fri, 02 Dec 2011)
New Revision: 36902
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
Log:
https://issues.jboss.org/browse/JBIDE-10277
Catch exception to create a correct message
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2011-12-02 19:33:11 UTC (rev 36901)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2011-12-02 20:03:22 UTC (rev 36902)
@@ -121,6 +121,8 @@
ex = e;
} catch (FileNotFoundException e) {
ex = e;
+ } catch (Exception e) {
+ ex = e;
}
if (ex == null ) {
ex = Utils.getExceptionIfItOccured(editor);
13 years, 1 month
JBoss Tools SVN: r36901 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-12-02 14:33:11 -0500 (Fri, 02 Dec 2011)
New Revision: 36901
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ContextValidationHelper.java
Log:
JBIDE-10161
https://issues.jboss.org/browse/JBIDE-10161
Derived resources are excluded from JBoss Tools validation.
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ContextValidationHelper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ContextValidationHelper.java 2011-12-02 19:09:24 UTC (rev 36900)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ContextValidationHelper.java 2011-12-02 19:33:11 UTC (rev 36901)
@@ -105,7 +105,8 @@
Set<IProject> projects = getAllProjects();
for (int i = 0; i < uris.length; i++) {
IFile currentFile = root.getFile(new Path(uris[i]));
- if(projects.contains(currentFile.getProject())) {
+ if(projects.contains(currentFile.getProject())
+ && !currentFile.isDerived(IResource.CHECK_ANCESTORS)) {
result.add(currentFile);
}
}
13 years, 1 month
JBoss Tools SVN: r36900 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-12-02 14:09:24 -0500 (Fri, 02 Dec 2011)
New Revision: 36900
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jboss.png
Log:
Updated JBoss Server Icon
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jboss.png
===================================================================
(Binary files differ)
13 years, 1 month