June 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r31912 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt.

by jbosstools-commits＠lists.jboss.org

Author: jlukas(a)redhat.com Date: 2011-06-08 08:43:16 -0400 (Wed, 08 Jun 2011) New Revision: 31912 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/WsTesterTest.java Log: minor ws tests update Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-06-08 12:41:28 UTC (rev 31911) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-06-08 12:43:16 UTC (rev 31912) @@ -101,7 +101,9 @@ bot.sleep(1500); ti = ti.getNode("Deployment Descriptor: " + project); new TreeItemAction(ti, "Generate Deployment Descriptor Stub").run(); + bot.sleep(1500); util.waitForNonIgnoredJobs(); + bot.sleep(1500); } private void createSampleSOAPWS(String project, String name, String pkg, String cls) { Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/WsTesterTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/WsTesterTest.java 2011-06-08 12:41:28 UTC (rev 31911) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/WsTesterTest.java 2011-06-08 12:43:16 UTC (rev 31912) @@ -113,7 +113,7 @@ dlg.ok(); L.log(Level.INFO, "Request: {0}", wstv.getRequestBody()); Assert.assertTrue(wstv.getRequestBody().contains( - "<echo xmlns = \"http://test.jboss.org/ns\">")); + "<tns:echo xmlns:tns=\"http://test.jboss.org/ns\">")); dlg = wstv.getFromWSDL(); dlg.setURI(uri); @@ -134,7 +134,7 @@ dlg.ok(); L.log(Level.INFO, "Request: {0}", wstv.getRequestBody()); Assert.assertTrue(wstv.getRequestBody().contains( - "<GetSearchResults xmlns = \"http://www.ecubicle.net/webservices\">")); + "<tns:GetSearchResults xmlns:tns=\"http://www.ecubicle.net/webservices\">")); } /** @@ -150,6 +150,7 @@ InputStream is = WsTesterTest.class.getResourceAsStream("/resources/jbossws/message_soap_out.xml"); wstv.setRequestBody(readResource(is)); wstv.invoke(); + bot.sleep(5000); String rsp = wstv.getResponseBody(); L.log(Level.FINE, "SOAP response: {0}", rsp); Assert.assertTrue(rsp.trim().length() > 0);

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r31911 - in trunk/ws/tests/org.jboss.tools.ws.ui.test: resources/jbds1602/jb and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jlukas(a)redhat.com Date: 2011-06-08 08:41:28 -0400 (Wed, 08 Jun 2011) New Revision: 31911 Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/example.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/soap12/ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/soap12/EnumTest.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/soap12/EnumTest.xsd Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java Log: ws tester test update Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/example.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/example.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/example.wsdl 2011-06-08 12:41:28 UTC (rev 31911) @@ -0,0 +1,351 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:tns="http://www.example.org/ws/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:basic="http://www.example.org/ws/basic/" + xmlns:extra="http://www.example.org/ws/extra/" xmlns:square="http://www.example.org/ws/square/" + xmlns:common="http://www.example.org/ws/common/" + name="example" targetNamespace="http://www.example.org/ws/"> + <wsdl:types> + <xsd:schema targetNamespace="http://www.example.org/ws/common/" + xmlns:tns="http://www.example.org/ws/common/"> + <xsd:element name="header" type="tns:headerType" /> + <xsd:complexType name="headerType"> + <xsd:sequence> + <xsd:element name="timestamp" type="xsd:dateTime" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + <xsd:schema targetNamespace="http://www.example.org/ws/square/" + xmlns:tns="http://www.example.org/ws/square/"> + <xsd:element name="square" type="tns:squareType" /> + <xsd:element name="squareResponse" type="tns:squareResponseType" /> + <xsd:element name="storeResult" type="tns:storeResultType" /> + <xsd:element name="storeHeader" type="tns:storeHeaderType" /> + <xsd:complexType name="squareType"> + <xsd:sequence> + <xsd:element name="a" type="xsd:int" /> + <xsd:element name="b" type="xsd:int" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="squareResponseType"> + <xsd:sequence> + <xsd:element name="out" type="xsd:int" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="storeResultType"> + <xsd:sequence> + <xsd:element name="a" type="xsd:int" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="storeHeaderType"> + <xsd:sequence> + <xsd:element name="id" type="xsd:string" /> + <xsd:element name="timestamp" type="xsd:dateTime" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + <xsd:schema targetNamespace="http://www.example.org/ws/basic/" + xmlns:tns="http://www.example.org/ws/basic/"> + <xsd:import namespace="http://www.example.org/ws/common/" /> + <xsd:element name="operationRequest" type="tns:requestType" /> + <xsd:element name="operationResponse" type="tns:responseType" /> + <xsd:element name="invalidNumberFault" type="tns:faultType" /> + <xsd:complexType name="requestType"> + <xsd:sequence> + <xsd:element name="a" type="xsd:float" /> + <xsd:element name="b" type="xsd:float" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="responseType"> + <xsd:sequence> + <xsd:element name="out" type="xsd:float" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="faultType"> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" /> + <xsd:element name="details" type="xsd:string" /> + <xsd:element name="a" type="xsd:float" /> + <xsd:element name="b" type="xsd:float" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + <xsd:schema targetNamespace="http://www.example.org/ws/extra/" + xmlns:tns="http://www.example.org/ws/extra/"> + <xsd:import namespace="http://www.example.org/ws/common/" /> + <xsd:element name="operationRequest" type="tns:requestType" /> + <xsd:element name="operationResponse" type="tns:responseType" /> + <xsd:element name="invalidNumberFault" type="tns:faultType" /> + <xsd:complexType name="requestType"> + <xsd:sequence> + <xsd:element name="a" type="xsd:double" /> + <xsd:element name="b" type="xsd:double" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="responseType"> + <xsd:sequence> + <xsd:element name="out" type="xsd:double" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="faultType"> + <xsd:sequence> + <xsd:element name="description" type="xsd:string" /> + <xsd:element name="details" type="xsd:string" /> + <xsd:element name="a" type="xsd:double" /> + <xsd:element name="b" type="xsd:double" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + </wsdl:types> + <wsdl:message name="square"> + <wsdl:part name="parameters" element="square:square" /> + </wsdl:message> + <wsdl:message name="squareResponse"> + <wsdl:part name="parameters" element="square:squareResponse" /> + </wsdl:message> + <wsdl:message name="storeResult"> + <wsdl:part name="parameters" element="square:storeResult" /> + </wsdl:message> + <wsdl:message name="storeHeader"> + <wsdl:part name="storeHeader" element="square:storeHeader" /> + </wsdl:message> + <wsdl:message name="addOperationRequest"> + <wsdl:part name="addOperationRequest" element="basic:operationRequest" /> + <wsdl:part name="header" element="common:header" /> + </wsdl:message> + <wsdl:message name="addOperationResponse"> + <wsdl:part name="addOperationResponse" element="basic:operationResponse" /> + </wsdl:message> + <wsdl:message name="minusOperationRequest"> + <wsdl:part name="parameters" element="basic:operationRequest" /> + <wsdl:part name="header" element="common:header" /> + </wsdl:message> + <wsdl:message name="minusOperationResponse"> + <wsdl:part name="parameters" element="basic:operationResponse" /> + </wsdl:message> + <wsdl:message name="multiplyOperationRequest"> + <wsdl:part name="parameters" element="extra:operationRequest" /> + </wsdl:message> + <wsdl:message name="multiplyOperationResponse"> + <wsdl:part name="parameters" element="extra:operationResponse" /> + </wsdl:message> + <wsdl:message name="divideOperationRequest"> + <wsdl:part name="parameters" element="extra:operationRequest" /> + <wsdl:part name="header" element="common:header" /> + </wsdl:message> + <wsdl:message name="divideOperationResponse"> + <wsdl:part name="parameters" element="extra:operationResponse" /> + </wsdl:message> + <wsdl:message name="invalidNumberFaultBasic"> + <wsdl:part name="parameters" element="basic:invalidNumberFault" /> + </wsdl:message> + <wsdl:message name="invalidNumberFaultExtra"> + <wsdl:part name="parameters" element="extra:invalidNumberFault" /> + </wsdl:message> + <wsdl:portType name="squarePortType"> + <wsdl:operation name="square"> + <wsdl:input message="tns:square" name="square" /> + <wsdl:output message="tns:squareResponse" name="squareResponse" /> + </wsdl:operation> + <wsdl:operation name="storeResult"> + <wsdl:input message="tns:storeResult" name="storeResult" + wsam:Action="http://www.example.org/ws/squarePortType/storeResult" + wsaw:Action="http://www.example.org/ws/squarePortType/storeResult" /> + </wsdl:operation> + </wsdl:portType> + <wsdl:portType name="addPortType"> + <wsdl:operation name="addOperation"> + <wsdl:input message="tns:addOperationRequest" name="addOperationRequest" /> + <wsdl:output message="tns:addOperationResponse" name="addOperationResponse" /> + <wsdl:fault message="tns:invalidNumberFaultBasic" name="invalidNumberFault" /> + </wsdl:operation> + </wsdl:portType> + <wsdl:portType name="minusPortType"> + <wsdl:operation name="minusOperation"> + <wsdl:input message="tns:minusOperationRequest" name="minusOperationRequest" /> + <wsdl:output message="tns:minusOperationResponse" name="minusOperationResponse" /> + <wsdl:fault message="tns:invalidNumberFaultBasic" name="invalidNumberFault" /> + </wsdl:operation> + </wsdl:portType> + <wsdl:portType name="multiplyPortType"> + <wsdl:operation name="multiplyOperation"> + <wsdl:input message="tns:multiplyOperationRequest" name="multiplyOperationRequest" + wsam:Action="http://www.example.org/ws/multiplyPortType/multiplyOperationRequest" + wsaw:Action="http://www.example.org/ws/multiplyPortType/multiplyOperationRequest" /> + <wsdl:output message="tns:multiplyOperationResponse" + name="multiplyOperationResponse" + wsam:Action="http://www.example.org/ws/multiplyPortType/multiplyOperationResponse" + wsaw:Action="http://www.example.org/ws/multiplyPortType/multiplyOperationResponse" /> + <wsdl:fault message="tns:invalidNumberFaultExtra" name="invalidNumberFault" + wsam:Action="http://www.example.org/ws/multiplyPortType/multiplyOperation/Fault/invali..." /> + </wsdl:operation> + </wsdl:portType> + <wsdl:portType name="dividerPortType"> + <wsdl:operation name="divideOperation"> + <wsdl:input message="tns:divideOperationRequest" name="divideOperationRequest" + wsam:Action="http://www.example.org/ws/dividerPortType/divideOperationRequest" + wsaw:Action="http://www.example.org/ws/dividerPortType/divideOperationRequest" /> + <wsdl:output message="tns:divideOperationResponse" name="divideOperationResponse" + wsam:Action="http://www.example.org/ws/dividerPortType/divideOperationResponse" + wsaw:Action="http://www.example.org/ws/dividerPortType/divideOperationResponse" /> + <wsdl:fault message="tns:invalidNumberFaultExtra" name="invalidNumberFault" + wsam:Action="http://www.example.org/ws/dividerPortType/divideOperation/Fault/invalidNu..." /> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="squareSOAP" type="tns:squarePortType"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <wsaw:UsingAddressing wsdl:required="true" /> + <wsp:PolicyReference URI="#squareSOAPBinding_WSAM_Addressing_Policy" /> + <wsdl:operation name="square"> + <soap:operation soapAction="http://www.example.org/ws/squareOperation" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="storeResult"> + <soap:operation soapAction="http://www.example.org/ws/storeResultOperation" /> + <wsdl:input> + <soap:header message="tns:storeHeader" part="storeHeader" + use="literal" /> + <soap:body use="literal" /> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="squareSOAP12" type="tns:squarePortType"> + <soap12:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <wsaw:UsingAddressing wsdl:required="true" /> + <wsp:PolicyReference URI="#squareSOAPBinding_WSAM_Addressing_Policy" /> + <wsdl:operation name="square"> + <soap12:operation soapAction="http://www.example.org/ws/squareOperation" /> + <wsdl:input> + <soap12:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap12:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="storeResult"> + <soap12:operation soapAction="http://www.example.org/ws/storeResultOperation" /> + <wsdl:input> + <soap12:header message="tns:storeHeader" part="storeHeader" + use="literal" /> + <soap12:body use="literal" /> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="addSOAP" type="tns:addPortType"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="addOperation"> + <soap:operation soapAction="http://www.example.org/ws/addOperation" /> + <wsdl:input> + <soap:header message="tns:addOperationRequest" part="header" + use="literal" /> + <soap:body parts="addOperationRequest" use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="minusSOAP" type="tns:minusPortType"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="minusOperation"> + <soap:operation soapAction="http://www.example.org/ws/minusOperation" /> + <wsdl:input> + <soap:header message="tns:storeHeader" part="storeHeader" + use="literal" /> + <soap:body parts="parameters" use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="multiplySOAP" type="tns:multiplyPortType"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <wsaw:UsingAddressing wsdl:required="true" /> + <wsp:PolicyReference URI="#multiplySOAPBinding_WSAM_Addressing_Policy" /> + <wsdl:operation name="multiplyOperation"> + <soap:operation soapAction="http://www.example.org/ws/multiplyOperation" /> + <wsdl:input> + <soap:header message="tns:storeHeader" part="storeHeader" + use="literal" /> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:binding name="divideSOAP" type="tns:dividerPortType"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <wsaw:UsingAddressing wsdl:required="true" /> + <wsp:PolicyReference URI="#divideSOAPBinding_WSAM_Addressing_Policy" /> + <wsdl:operation name="divideOperation"> + <soap:operation soapAction="http://www.example.org/ws/divideOperation" /> + <wsdl:input> + <soap:header message="tns:divideOperationRequest" part="header" + use="literal" /> + <soap:body parts="parameters" use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="basic"> + <wsdl:port name="adderPort" binding="tns:addSOAP"> + <soap:address location="http://www.example.org/" /> + </wsdl:port> + <wsdl:port name="minusPort" binding="tns:minusSOAP"> + <soap:address location="http://www.example.org/" /> + </wsdl:port> + </wsdl:service> + <wsdl:service name="extra"> + <wsdl:port name="multiplierPort" binding="tns:multiplySOAP"> + <soap:address location="http://www.example.org/" /> + </wsdl:port> + <wsdl:port name="dividerPort" binding="tns:divideSOAP"> + <soap:address location="http://www.example.org/" /> + </wsdl:port> + </wsdl:service> + <wsdl:service name="square"> + <wsdl:port name="squarePort" binding="tns:squareSOAP"> + <soap:address location="http://www.example.org/" /> + </wsdl:port> + </wsdl:service> + <wsdl:service name="square12"> + <wsdl:port name="squarePort12" binding="tns:squareSOAP12"> + <soap12:address location="http://www.example.org/" /> + </wsdl:port> + </wsdl:service> + <wsp:Policy wsu:Id="multiplySOAPBinding_WSAM_Addressing_Policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing> + <wsp:Policy /> + </wsam:Addressing> + </wsp:Policy> + <wsp:Policy wsu:Id="divideSOAPBinding_WSAM_Addressing_Policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing> + <wsp:Policy /> + </wsam:Addressing> + </wsp:Policy> + <wsp:Policy wsu:Id="squareSOAPBinding_WSAM_Addressing_Policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing> + <wsp:Policy /> + </wsam:Addressing> + </wsp:Policy> +</wsdl:definitions> Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl 2011-06-08 11:28:06 UTC (rev 31910) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl 2011-06-08 12:41:28 UTC (rev 31911) @@ -7,12 +7,12 @@ <xs:element name="echoResponse" type="tns:echoResponse"/> <xs:complexType name="echo"> <xs:sequence> -<xs:element minOccurs="0" name="arg0" type="ns1:someType"/> +<xs:element name="arg0" type="ns1:someType"/> </xs:sequence> </xs:complexType> <xs:complexType name="echoResponse"> <xs:sequence> -<xs:element minOccurs="0" name="return" type="ns1:someType"/> +<xs:element name="return" type="ns1:someType"/> </xs:sequence> </xs:complexType> </xs:schema> @@ -39,14 +39,14 @@ <xs:sequence> <xs:element ref="ns1:A"/> <xs:element ref="ns2:B"/> -<xs:element minOccurs="0" ref="ns5:OtherType"/> +<xs:element ref="ns5:OtherType"/> </xs:sequence> <xs:attribute ref="ns3:C" use="required"/> <xs:attribute ref="ns4:D" use="required"/> </xs:complexType> <xs:complexType name="otherType"> <xs:sequence> -<xs:element minOccurs="0" ref="ns2:description"/> +<xs:element ref="ns2:description"/> </xs:sequence> <xs:attribute ref="ns6:myid"/> <xs:attribute ref="ns3:Y" use="required"/> Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/soap12/EnumTest.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/soap12/EnumTest.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/soap12/EnumTest.wsdl 2011-06-08 12:41:28 UTC (rev 31911) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions + xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" + xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:tns="http://enumtest/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + targetNamespace="http://enumtest/" name="EnumTest"> + <types> + <xsd:schema> + <xsd:import namespace="http://enumtest/" schemaLocation="EnumTest.xsd" /> + </xsd:schema> + </types> + <message name="hello"> + <part name="parameters" element="tns:hello" /> + </message> + <message name="helloResponse"> + <part name="parameters" element="tns:helloResponse" /> + </message> + <portType name="EnumTest"> + <operation name="hello"> + <input wsam:Action="http://EnumTest/EnumTest/helloRequest" + message="tns:hello" /> + <output wsam:Action="http://enumtest/EnumTest/helloResponse" + message="tns:helloResponse" /> + </operation> + </portType> + <binding name="EnumTestPortBinding" type="tns:EnumTest"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <operation name="hello"> + <soap:operation soapAction="http://localhost:8080/soapAction"/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <binding name="EnumTest12PortBinding" type="tns:EnumTest"> + <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> + <operation name="hello"> + <soap12:operation soapAction="http://localhost:8081/soap12Action" /> + <input> + <soap12:body use="literal" /> + </input> + <output> + <soap12:body use="literal" /> + </output> + </operation> + </binding> + <service name="EnumTest"> + <port name="EnumTestPort" binding="tns:EnumTestPortBinding"> + <soap:address location="http://localhost:8080/A/EnumTest"/> + </port> + <port name="EnumTest12Port" binding="tns:EnumTest12PortBinding"> + <soap12:address location="http://localhost:8081/A/EnumTest" /> + </port> + </service> +</definitions> \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/soap12/EnumTest.xsd =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/soap12/EnumTest.xsd (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/soap12/EnumTest.xsd 2011-06-08 12:41:28 UTC (rev 31911) @@ -0,0 +1,48 @@ +<?xml version='1.0' encoding='UTF-8'?> +<xs:schema xmlns:tns="http://enumtest/" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://enumtest/"> + + <xs:element name="hello" type="tns:hello" /> + + <xs:element name="helloResponse" type="tns:helloResponse" /> + + <xs:complexType name="hello"> + <xs:sequence> + <xs:element name="arg0" type="tns:someType" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="someType"> + <xs:sequence> + <xs:element name="en" type="tns:someEnum" /> + <xs:element name="email" type="tns:email" /> + <xs:element name="choice" type="tns:someChoice" /> + </xs:sequence> + + </xs:complexType> + + <xs:complexType name="helloResponse"> + <xs:sequence> + <xs:element name="return" type="tns:someType" /> + </xs:sequence> + </xs:complexType> + + <xs:simpleType name="someEnum"> + <xs:restriction base="xs:string"> + <xs:enumeration value="CZ" /> + <xs:enumeration value="UK" /> + <xs:enumeration value="US" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="email"> + <xs:restriction base="xs:string"> + <xs:pattern value="([a-zA-Z0-9_\-])([a-zA-Z0-9_\-\.]*)@(\[((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}|((([a-zA-Z0-9\-]+)\.)+))([a-zA-Z]{2,}|(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\])"/> + </xs:restriction> + </xs:simpleType> + + <xs:complexType name="someChoice"> + <xs:choice> + <xs:element name="optionA" type="xs:string"></xs:element> + <xs:element name="optionB" type="xs:string"></xs:element> + </xs:choice> + </xs:complexType> +</xs:schema> \ No newline at end of file Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2011-06-08 11:28:06 UTC (rev 31910) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2011-06-08 12:41:28 UTC (rev 31911) @@ -19,6 +19,7 @@ import junit.framework.TestCase; +import org.eclipse.core.runtime.IStatus; import org.jboss.tools.ws.ui.utils.SchemaUtils; import org.jboss.tools.ws.ui.utils.TesterWSDLUtils; import org.junit.Assert; @@ -27,8 +28,19 @@ public class TesterWSDLUtilsTest extends TestCase { @Test + public void testIsWSDLAccessible() throws Exception { + URL u = TesterWSDLUtilsTest.class.getResource("/jbide6558/x.wsdl").toURI().toURL(); + IStatus st = TesterWSDLUtils.isWSDLAccessible(u); + Assert.assertEquals(IStatus.OK, st.getSeverity()); + + st = TesterWSDLUtils.isWSDLAccessible(new URL("http://https.ax.com/a.wsdl")); + Assert.assertEquals(IStatus.ERROR, st.getSeverity()); + } + + + @Test public void testGetNSServiceNameAndMessageNameArray() { - Definition def = readWSDL("/jbide6558/x.wsdl"); + Definition def = readWSDL("/jbide6558/", "x.wsdl"); String[] r = TesterWSDLUtils.getNSServiceNameAndMessageNameArray(def, "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello"); Assert.assertArrayEquals(new String[] {"http://webservices.samples.jboss.org/", "HelloWorldService", "HelloWorldPort"}, r); @@ -46,12 +58,19 @@ String r = TesterWSDLUtils.getEndpointURL(def, "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello"); Assert.assertEquals("http://localhost:8080/ws/HelloWorld", r); - def = readWSDL("/jbide6593/original.wsdl"); + def = readWSDL("/jbide6593/", "original.wsdl"); r = TesterWSDLUtils.getEndpointURL(def, "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); Assert.assertEquals("http://www.ecubicle.net/gsearch_rss.asmx", r); r = TesterWSDLUtils.getEndpointURL(def, "EchoService", "EchoPort", "EchoPortBinding", "echo"); Assert.assertEquals("http://localhost:8080/webws/EchoPortType", r); + + def = readWSDL("/soap12/EnumTest.wsdl"); + r = TesterWSDLUtils.getEndpointURL(def, "EnumTest", "EnumTestPort", "EnumTestPortBinding", "hello"); + Assert.assertEquals("http://localhost:8080/A/EnumTest", r); + + r = TesterWSDLUtils.getEndpointURL(def, "EnumTest", "EnumTest12Port", "EnumTest12PortBinding", "hello"); + Assert.assertEquals("http://localhost:8081/A/EnumTest", r); } @Test @@ -66,6 +85,13 @@ r = TesterWSDLUtils.getActionURL(def, "EchoService", "EchoPort", "EchoPortBinding", "echo"); Assert.assertEquals("", r); + + def = readWSDL("/soap12/EnumTest.wsdl"); + r = TesterWSDLUtils.getActionURL(def, "EnumTest", "EnumTestPort", "EnumTestPortBinding", "hello"); + Assert.assertEquals("http://localhost:8080/soapAction", r); + + r = TesterWSDLUtils.getActionURL(def, "EnumTest", "EnumTest12Port", "EnumTest12PortBinding", "hello"); + Assert.assertEquals("http://localhost:8081/soap12Action", r); } @Test @@ -161,8 +187,12 @@ } private Definition readWSDL(String path) { + return readWSDL(path, ""); + } + + private Definition readWSDL(String path, String file) { try { - URL url = SchemaUtils.class.getResource(path).toURI().toURL(); + URL url = TesterWSDLUtilsTest.class.getResource(path + file).toURI().toURL(); return SchemaUtils.readWSDLURL(url); } catch (MalformedURLException e) { e.printStackTrace();

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r31910 - in trunk/forge/plugins/org.jboss.tools.forge.ui: META-INF and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-06-08 07:28:06 -0400 (Wed, 08 Jun 2011) New Revision: 31910 Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java Removed: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgePlugin.java Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/CommandRecorder.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/InputReadJob.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeRuntime.java Log: remove seam references Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-06-08 11:17:56 UTC (rev 31909) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-06-08 11:28:06 UTC (rev 31910) @@ -17,6 +17,6 @@ org.eclipse.ui.views Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Bundle-Activator: org.jboss.tools.forge.ForgePlugin +Bundle-Activator: org.jboss.tools.forge.ForgeUIPlugin Bundle-ClassPath: ., lib/jline.jar Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-06-08 11:17:56 UTC (rev 31909) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-06-08 11:28:06 UTC (rev 31910) @@ -10,7 +10,7 @@ <view category="org.jboss.tools.forge" class="org.jboss.tools.forge.view.ConsoleView" - id="org.jboss.tools.seam.forge.console" + id="org.jboss.tools.forge.console" name="Forge Console" restorable="true"> </view> @@ -18,29 +18,29 @@ <extension point="org.eclipse.ui.viewActions"> <viewContribution - id="org.jboss.tools.seam.forge.view" - targetID="org.jboss.tools.seam.forge.console"> + id="org.jboss.tools.forge.view" + targetID="org.jboss.tools.forge.console"> <menu - id="org.jboss.tools.seam.forge.menubar" - label="Seam Forge"> + id="org.jboss.tools.forge.menubar" + label="Forge"> </menu> <action class="org.jboss.tools.forge.action.StopDelegate" icon="icons/stop.gif" - id="org.jboss.tools.seam.forge.stop" + id="org.jboss.tools.forge.stop" label="Stop Forge" - menubarPath="org.jboss.tools.seam.forge.menubar" + menubarPath="org.jboss.tools.forge.menubar" style="push" - toolbarPath="org.jboss.tools.seam.forge.toolbar"> + toolbarPath="org.jboss.tools.forge.toolbar"> </action> <action class="org.jboss.tools.forge.action.StartDelegate" icon="icons/start.gif" - id="org.jboss.tools.seam.forge.start" + id="org.jboss.tools.forge.start" label="Start Forge" - menubarPath="org.jboss.tools.seam.forge.menu" + menubarPath="org.jboss.tools.forge.menu" style="push" - toolbarPath="org.jboss.tools.seam.forge.toolbar"> + toolbarPath="org.jboss.tools.forge.toolbar"> </action> </viewContribution> </extension> @@ -48,13 +48,13 @@ <page name="Forge" class="org.jboss.tools.forge.preferences.EmptyPreferencePage" - id="org.jboss.tools.seam.forge"> + id="org.jboss.tools.forge"> </page> <page name="Installed Forge Runtimes" - category="org.jboss.tools.seam.forge" + category="org.jboss.tools.forge" class="org.jboss.tools.forge.preferences.ForgeInstallationsPreferencePage" - id="org.jboss.tools.seam.forge.runtimes"> + id="org.jboss.tools.forge.runtimes"> </page> </extension> Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgePlugin.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgePlugin.java 2011-06-08 11:17:56 UTC (rev 31909) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgePlugin.java 2011-06-08 11:28:06 UTC (rev 31910) @@ -1,40 +0,0 @@ -package org.jboss.tools.forge; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.jboss.tools.forge.launching.ForgeRuntime; -import org.osgi.framework.BundleContext; - -public class ForgePlugin extends AbstractUIPlugin { - - public static final String PLUGIN_ID = "org.jboss.tools.seam.forge"; - - private static ForgePlugin plugin; - - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - public void stop(BundleContext context) throws Exception { - if (ForgeRuntime.INSTANCE.isForgeRunning()) { - ForgeRuntime.INSTANCE.stopForge(); - } - plugin = null; - super.stop(context); - } - - public static ForgePlugin getDefault() { - return plugin; - } - - public static void log(Throwable t) { - getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t)); - } - - private static IStatus newErrorStatus(String message, Throwable exception) { - return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception); - } - -} Copied: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java (from rev 31904, trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgePlugin.java) =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgeUIPlugin.java 2011-06-08 11:28:06 UTC (rev 31910) @@ -0,0 +1,40 @@ +package org.jboss.tools.forge; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.jboss.tools.forge.launching.ForgeRuntime; +import org.osgi.framework.BundleContext; + +public class ForgeUIPlugin extends AbstractUIPlugin { + + public static final String PLUGIN_ID = "org.jboss.tools.forge.ui"; + + private static ForgeUIPlugin plugin; + + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + public void stop(BundleContext context) throws Exception { + if (ForgeRuntime.INSTANCE.isForgeRunning()) { + ForgeRuntime.INSTANCE.stopForge(); + } + plugin = null; + super.stop(context); + } + + public static ForgeUIPlugin getDefault() { + return plugin; + } + + public static void log(Throwable t) { + getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t)); + } + + private static IStatus newErrorStatus(String message, Throwable exception) { + return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception); + } + +} Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/CommandRecorder.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/CommandRecorder.java 2011-06-08 11:17:56 UTC (rev 31909) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/CommandRecorder.java 2011-06-08 11:28:06 UTC (rev 31910) @@ -24,7 +24,7 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.ISetSelectionTarget; import org.eclipse.ui.texteditor.ITextEditor; -import org.jboss.tools.forge.ForgePlugin; +import org.jboss.tools.forge.ForgeUIPlugin; import org.jboss.tools.forge.importer.ProjectConfigurationUpdater; import org.jboss.tools.forge.importer.ProjectImporter; @@ -106,7 +106,7 @@ try { project.refreshLocal(IResource.DEPTH_INFINITE, null); } catch (CoreException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } if ("pwd".equals(currentCommand)) { @@ -148,7 +148,7 @@ ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect)); } } catch (PartInitException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } else if ("entity".equals(currentCommand)) { int index = beforePrompt.lastIndexOf("Picked up type <JavaResource>: "); @@ -165,7 +165,7 @@ try { objectToSelect = ((ICompilationUnit)javaElement).getTypes()[0]; } catch (JavaModelException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer"); @@ -180,7 +180,7 @@ ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect)); } } catch (PartInitException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } else if ("field".equals(currentCommand)) { try { @@ -213,11 +213,11 @@ } } } catch (JavaModelException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } } catch (PartInitException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } else if ("prettyfaces".equals(currentCommand)) { int index = beforePrompt.lastIndexOf("***SUCCESS*** Installed [com.ocpsoft.prettyfaces] successfully."); @@ -249,7 +249,7 @@ ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect)); } } catch (PartInitException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } else if ("build".equals(currentCommand)) { @@ -257,9 +257,9 @@ } try { - workbenchPage.showView("org.jboss.tools.seam.forge.console").setFocus(); + workbenchPage.showView("org.jboss.tools.forge.console").setFocus(); } catch (PartInitException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/InputReadJob.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/InputReadJob.java 2011-06-08 11:17:56 UTC (rev 31909) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/InputReadJob.java 2011-06-08 11:28:06 UTC (rev 31910) @@ -7,7 +7,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.model.IStreamsProxy; -import org.jboss.tools.forge.ForgePlugin; +import org.jboss.tools.forge.ForgeUIPlugin; class InputReadJob extends Job { @@ -30,7 +30,7 @@ buffer.setLength(0); } } catch (IOException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } return Status.OK_STATUS; } Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java 2011-06-08 11:17:56 UTC (rev 31909) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java 2011-06-08 11:28:06 UTC (rev 31910) @@ -4,7 +4,7 @@ import org.eclipse.debug.core.IStreamListener; import org.eclipse.debug.core.model.IStreamMonitor; -import org.jboss.tools.forge.ForgePlugin; +import org.jboss.tools.forge.ForgeUIPlugin; class StreamListener implements IStreamListener { @@ -32,7 +32,7 @@ buffer = new StringBuffer(); } } catch (IOException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeRuntime.java 2011-06-08 11:17:56 UTC (rev 31909) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeRuntime.java 2011-06-08 11:28:06 UTC (rev 31910) @@ -44,7 +44,7 @@ import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.jdt.launching.IRuntimeClasspathEntry; import org.eclipse.jdt.launching.JavaRuntime; -import org.jboss.tools.forge.ForgePlugin; +import org.jboss.tools.forge.ForgeUIPlugin; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -73,10 +73,10 @@ } private static void initializeInstallations() { - String installPrefsXml = ForgePlugin.getDefault().getPreferenceStore().getString(PREF_FORGE_INSTALLATIONS); + String installPrefsXml = ForgeUIPlugin.getDefault().getPreferenceStore().getString(PREF_FORGE_INSTALLATIONS); if (installPrefsXml == null || "".equals(installPrefsXml)) { createInitialInstallations(); - installPrefsXml = ForgePlugin.getDefault().getPreferenceStore().getString(PREF_FORGE_INSTALLATIONS); + installPrefsXml = ForgeUIPlugin.getDefault().getPreferenceStore().getString(PREF_FORGE_INSTALLATIONS); } initializeFromXml(installPrefsXml); } @@ -112,9 +112,9 @@ try { result = documentBuilder.parse(inputStream); } catch (SAXException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } catch (IOException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } return result; } @@ -124,7 +124,7 @@ try { result = new BufferedInputStream(new ByteArrayInputStream(string.getBytes("UTF8"))); } catch (UnsupportedEncodingException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } return result; } @@ -133,7 +133,7 @@ try { return DocumentBuilderFactory.newInstance().newDocumentBuilder(); } catch (ParserConfigurationException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); return null; } } @@ -161,13 +161,13 @@ private static void createInitialInstallations() { try { - File file = FileLocator.getBundleFile(ForgePlugin.getDefault().getBundle()); + File file = FileLocator.getBundleFile(ForgeUIPlugin.getDefault().getBundle()); defaultInstallation = new ForgeInstallation("embedded", file.getAbsolutePath()); installations = new ArrayList<ForgeInstallation>(); installations.add(defaultInstallation); saveInstallations(); } catch (IOException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } @@ -183,11 +183,11 @@ private static void saveInstallations() { try { String xml = serializeDocument(createInstallationsDocument()); - ForgePlugin.getDefault().getPreferenceStore().setValue(PREF_FORGE_INSTALLATIONS, xml); + ForgeUIPlugin.getDefault().getPreferenceStore().setValue(PREF_FORGE_INSTALLATIONS, xml); } catch (IOException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } catch (TransformerException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } } @@ -208,10 +208,10 @@ public static final ForgeRuntime INSTANCE = new ForgeRuntime(); - public static final String STATE_NOT_RUNNING = "org.jboss.tools.seam.forge.notRunning"; - public static final String STATE_RUNNING = "org.jboss.tools.seam.forge.running"; - public static final String STATE_STARTING = "org.jboss.tools.seam.forge.starting"; - public static final String STATE_STOPPING = "org.jboss.tools.seam.forge.stopping"; + public static final String STATE_NOT_RUNNING = "org.jboss.tools.forge.notRunning"; + public static final String STATE_RUNNING = "org.jboss.tools.forge.running"; + public static final String STATE_STARTING = "org.jboss.tools.forge.starting"; + public static final String STATE_STOPPING = "org.jboss.tools.forge.stopping"; private IProcess forgeProcess = null; private String runtimeState = STATE_NOT_RUNNING; @@ -232,7 +232,7 @@ ILaunchConfiguration[] configurations = manager.getLaunchConfigurations(type); for (int i = 0; i < configurations.length; i++) { ILaunchConfiguration configuration = configurations[i]; - if (configuration.getName().equals("Seam Forge")) { + if (configuration.getName().equals("Forge")) { configuration.delete(); break; } @@ -240,7 +240,7 @@ ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, "Forge"); workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.jboss.forge.shell.Bootstrap"); List<String> classpath = new ArrayList<String>(); -// Bundle bundle = Platform.getBundle("org.jboss.tools.seam.forge"); +// Bundle bundle = Platform.getBundle("org.jboss.tools.forge"); File file = null; // try { // file = FileLocator.getBundleFile(bundle); @@ -250,7 +250,7 @@ // } // if (file == null) return; if (!file.exists()) { - ForgePlugin.log(new RuntimeException("Not a correct Forge runtime.")); + ForgeUIPlugin.log(new RuntimeException("Not a correct Forge runtime.")); setRuntimeState(STATE_NOT_RUNNING); return; } @@ -261,7 +261,7 @@ } }); if (children.length != 1) { - ForgePlugin.log(new RuntimeException("Not a correct Forge runtime.")); + ForgeUIPlugin.log(new RuntimeException("Not a correct Forge runtime.")); setRuntimeState(STATE_NOT_RUNNING); return; } @@ -290,7 +290,6 @@ IPath path = root.getLocation(); File workingDir = path.toFile(); workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, workingDir.getAbsolutePath()); -// workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "-Dseam.forge.shell.colorEnabled=true"); workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "-Dforge.compatibility.IDE=true"); ILaunchConfiguration configuration = workingCopy.doSave(); ILaunch launch = configuration.launch(ILaunchManager.RUN_MODE, null, false, false); @@ -302,7 +301,7 @@ setRuntimeState(STATE_RUNNING); } } catch (CoreException e) { - ForgePlugin.log(e); + ForgeUIPlugin.log(e); } }

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r31909 - in trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test: ca and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-06-08 07:17:56 -0400 (Wed, 08 Jun 2011) New Revision: 31909 Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamJbide3845Test.java Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java Log: JBIDE-3845 Code assist for #{messages['...']} should suggest properties when user types "[". JUnit Test Case is added for Seam project Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-06-08 10:58:54 UTC (rev 31908) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-06-08 11:17:56 UTC (rev 31909) @@ -25,6 +25,7 @@ import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1645Test; import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1676Test; import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistTest; +import org.jboss.tools.seam.ui.test.ca.SeamJbide3845Test; import org.jboss.tools.seam.ui.test.el.ELExprPartitionerTest; import org.jboss.tools.seam.ui.test.hyperlink.SeamViewHyperlinkPartitionerTest; import org.jboss.tools.seam.ui.test.jbide.JBide3989Test; @@ -52,6 +53,7 @@ public static Test suite() { TestSuite suite = new TestSuite("Seam UI tests"); + suite.addTestSuite(ELExprPartitionerTest.class); suite.addTestSuite(OpenSeamComponentDialogTest.class); suite.addTest(SeamComponentsViewAllTests.suite()); @@ -65,6 +67,7 @@ suite.addTest(SeamELContentAssistTest.suite()); suite.addTestSuite(SeamELContentAssistJbide1676Test.class); suite.addTestSuite(SeamELContentAssistJbide1645Test.class); + suite.addTestSuite(SeamJbide3845Test.class); // suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamSettingsPreferencesPageTest.class), "org.jboss.tools.seam.ui.test", "projects/TestSeamSettingsPreferencesPage", "TestSeamSettingsPreferencesPage")); suite.addTestSuite(PackageNamesTest.class); suite.addTestSuite(JBide3989Test.class); Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamJbide3845Test.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamJbide3845Test.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamJbide3845Test.java 2011-06-08 11:17:56 UTC (rev 31909) @@ -0,0 +1,78 @@ +/******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.ui.test.ca; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.FindReplaceDocumentAdapter; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; +import org.jboss.tools.test.util.TestProjectProvider; + +/** + * Test cast testing http://jira.jboss.com/jira/browse/JBIDE-3845 issue. + * + * @author Victor V. Rubezhny + * + */ +public class SeamJbide3845Test extends ContentAssistantTestCase { + private static final String PROJECT_NAME = "SeamJbide3845Test"; //$NON-NLS-1$ + private static final String JSP_PAGE_NAME = "/WebContent/jsp_page.jsp"; //$NON-NLS-1$ + private static final String XHTML_PAGE_NAME = "/WebContent/xhtml_page.xhtml"; //$NON-NLS-1$ + private static final String[] PROPOSALS = new String[] {"Message['javax.faces.component.UIInput.CONVERSION']"}; //$NON-NLS-1$ + + private TestProjectProvider provider = null; + + + private static final String STRING_TO_FIND = "#{Message["; + + public static Test suite() { + return new TestSuite(SeamJbide3845Test.class); + } + + public void setUp() throws Exception { + provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", null, PROJECT_NAME,false); //$NON-NLS-1$ + project = provider.getProject(); + } + + protected void tearDown() throws Exception { + if(provider != null) { + provider.dispose(); + } + } + + public void testJbide3845OnJspPage(){ + doTheResourceBundleCAForALongPropertyNameTest(JSP_PAGE_NAME, STRING_TO_FIND, PROPOSALS); + } + + public void testJbide3845OnXhtmlPage(){ + doTheResourceBundleCAForALongPropertyNameTest(XHTML_PAGE_NAME, STRING_TO_FIND, PROPOSALS); + } + + protected void doTheResourceBundleCAForALongPropertyNameTest(String pageName, String textToFind, String[] proposals) { + openEditor(pageName); + IRegion reg=null; + try { + reg = new FindReplaceDocumentAdapter(this.document).find(0, textToFind, true, false, false, false); //$NON-NLS-1$ + } catch (BadLocationException e) { + fail(e.getMessage()); + } + + assertNotNull("Cannot find a text region to test", reg); + + final ICompletionProposal[] rst = checkProposals(pageName,reg.getOffset() + textToFind.length(), proposals, false); + + closeEditor(); + } +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamJbide3845Test.java ___________________________________________________________________ Added: svn:mime-type + text/plain

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r31908 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-06-08 06:58:54 -0400 (Wed, 08 Jun 2011) New Revision: 31908 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java Log: JBIDE-3845 Code assist for #{messages['...']} should suggest properties when user types "[". JUnit Test Case is added for JSF project Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java 2011-06-08 10:57:17 UTC (rev 31907) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/JsfJBide3845Test.java 2011-06-08 10:58:54 UTC (rev 31908) @@ -10,9 +10,6 @@ ******************************************************************************/ package org.jboss.tools.jsf.jsp.ca.test; -import java.util.ArrayList; -import java.util.List; - import junit.framework.Test; import junit.framework.TestSuite; @@ -20,8 +17,6 @@ import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.common.base.test.contentassist.CATestUtil; import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; import org.jboss.tools.test.util.TestProjectProvider; @@ -61,7 +56,7 @@ doTheResourceBundleCAForALongPropertyNameTest(JSP_PAGE_NAME, STRING_TO_FIND, PROPOSALS); } - public void testJbide6061OnXhtmlPage(){ + public void testJbide3845OnXhtmlPage(){ doTheResourceBundleCAForALongPropertyNameTest(XHTML_PAGE_NAME, STRING_TO_FIND, PROPOSALS); }

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r31907 - trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-06-08 06:57:17 -0400 (Wed, 08 Jun 2011) New Revision: 31907 Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/jsp_page.jsp trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/xhtml_page.xhtml Log: JBIDE-3845 Code assist for #{messages['...']} should suggest properties when user types "[". JUnit Test Case is added for Seam project Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/jsp_page.jsp =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/jsp_page.jsp (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/jsp_page.jsp 2011-06-08 10:57:17 UTC (rev 31907) @@ -0,0 +1,21 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> + +<f:loadBundle var="Message" basename="messages" /> + +<html> + <head> + <title>Hello!</title> + </head> + + <body> + <f:view> + <h3> + <h:outputText value="#{Message[}" />, + <h:outputText value="#{Message.hello_message}" />, + <h:outputText value="#{user.name}" />! + </h3> + </f:view> + </body> + +</html> \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/jsp_page.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/xhtml_page.xhtml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/xhtml_page.xhtml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/xhtml_page.xhtml 2011-06-08 10:57:17 UTC (rev 31907) @@ -0,0 +1,11 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<f:loadBundle var="Message" basename="messages" /> +<body> + <h:outputText value="#{Message[}" /> +</body> +</html> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/xhtml_page.xhtml ___________________________________________________________________ Added: svn:mime-type + text/plain

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r31906 - in trunk/seam/tests/org.jboss.tools.seam.ui.test/projects: SeamJbide3845Test and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-06-08 06:56:41 -0400 (Wed, 08 Jun 2011) New Revision: 31906 Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.classpath trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.project trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/.jsdtscope trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.jdt.core.prefs trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.component trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.hibernate.eclipse.console.prefs trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.ide.eclipse.as.core.prefs trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.tools.seam.core.prefs trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/WEB-INF/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/WEB-INF/faces-config.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/src/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/src/hot/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/src/main/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/src/main/messages_en.properties Log: JBIDE-3845 Code assist for #{messages['...']} should suggest properties when user types "[". JUnit Test Case is added for Seam project Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.classpath =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.classpath (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.classpath 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="WebContent/WEB-INF/dev" path="src/hot"/> + <classpathentry kind="src" path="src/main"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.project =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.project (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.project 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>SeamJbide3845Test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.seam.core.seambuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.hibernate.eclipse.console.hibernateBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.jboss.tools.seam.core.seamnature</nature> + <nature>org.hibernate.eclipse.console.hibernateNature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/.jsdtscope =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/.jsdtscope (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/.jsdtscope 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.jdt.core.prefs 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,8 @@ +#Fri Jun 03 20:42:18 MSD 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.component 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="SeamJbide3845Test"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main"/> + <wb-resource deploy-path="/WEB-INF/dev" source-path="/src/hot"/> + <property name="context-root" value="SeamJbide3845Test"/> + <property name="java-output-path" value="/SeamJbide3845Test/build/classes"/> + </wb-module> +</project-modules> Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,7 @@ +<root> + <facet id="jst.jsf"> + <node name="libprov"> + <attribute name="provider-id" value="runtime-library-provider"/> + </node> + </facet> +</root> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 5.1 Runtime"/> + <fixed facet="java"/> + <fixed facet="jst.web"/> + <fixed facet="wst.jsdt.web"/> + <installed facet="java" version="1.5"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="jst.jsf" version="1.2"/> + <installed facet="jst.seam" version="1.2"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.hibernate.eclipse.console.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.hibernate.eclipse.console.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.hibernate.eclipse.console.prefs 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,4 @@ +#Fri Jun 03 20:42:27 MSD 2011 +default.configuration=SeamJbide3845Test +eclipse.preferences.version=1 +hibernate3.enabled=true Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.hibernate.eclipse.console.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.ide.eclipse.as.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.ide.eclipse.as.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.ide.eclipse.as.core.prefs 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,3 @@ +#Fri Jun 03 20:42:51 MSD 2011 +eclipse.preferences.version=1 +org.jboss.ide.eclipse.as.core.singledeployable.deployableList=resources/SeamJbide3845Test-ds.xml\nresources/seam12kick-ds.xml\n Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.ide.eclipse.as.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.tools.seam.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.tools.seam.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.tools.seam.core.prefs 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,15 @@ +#Fri Jun 03 20:42:27 MSD 2011 +action.package=org.domain.seamjbide3845test.session +action.sources=/SeamJbide3845Test/src/hot +eclipse.preferences.version=1 +model.package=org.domain.seamjbide3845test.entity +model.sources=/SeamJbide3845Test/src/main +seam.project.connection.profile=New HSQLDB +seam.project.deployment.type=war +seam.project.settings.version=1.1 +seam.project.web.root.folder=/SeamJbide3845Test/WebContent +seam.runtime.name=jboss-seam-1.2.1.GA +seam.test.creating=false +seam.test.project=SeamJbide3845Test-test +test.package=org.domain.seamjbide3845test.test +test.sources=/SeamJbide3845Test-test/test-src Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/.settings/org.jboss.tools.seam.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/WEB-INF/faces-config.xml 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<faces-config + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" + version="1.2"> + <application> + <message-bundle>messages</message-bundle> + </application> + <lifecycle> + <phase-listener>org.jboss.seam.jsf.TransactionalSeamPhaseListener</phase-listener> + </lifecycle> + +</faces-config> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/src/main/messages_en.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/src/main/messages_en.properties (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/src/main/messages_en.properties 2011-06-08 10:56:41 UTC (rev 31906) @@ -0,0 +1,115 @@ +up=\u2191 +down=\u2193 +left=\u2039 +right=\u203A + +validator.assertFalse=validation failed +validator.assertTrue=validation failed +validator.future=must be a future date +validator.length=length must be between {min} and {max} +validator.max=must be less than or equal to {value} +validator.min=must be greater than or equal to {value} +validator.notNull=may not be null +validator.past=must be a past date +validator.pattern=must match "{regex}" +validator.range=must be between {min} and {max} +validator.size=size must be between {min} and {max} +validator.email=must be a well-formed email address + +org.jboss.seam.loginFailed=Login failed +org.jboss.seam.loginSuccessful=Welcome, #0 + +org.jboss.seam.TransactionFailed=Transaction failed +org.jboss.seam.NoConversation=The conversation ended, timed out or was processing another request +org.jboss.seam.IllegalNavigation=Illegal navigation +org.jboss.seam.ProcessEnded=Process #0 already ended +org.jboss.seam.ProcessNotFound=Process #0 not found +org.jboss.seam.TaskEnded=Task #0 already ended +org.jboss.seam.TaskNotFound=Task #0 not found +org.jboss.seam.NotLoggedIn=Please log in first + +javax.faces.component.UIInput.CONVERSION=value could not be converted to the expected type +javax.faces.component.UIInput.REQUIRED=value is required +javax.faces.component.UIInput.UPDATE=an error occurred when processing your submitted information +javax.faces.component.UISelectOne.INVALID=value is not valid +javax.faces.component.UISelectMany.INVALID=value is not valid + +javax.faces.converter.BigDecimalConverter.DECIMAL=value must be a number +javax.faces.converter.BigDecimalConverter.DECIMAL_detail=value must be a signed decimal number consisting of zero or more digits, optionally followed by a decimal point and fraction, eg. {1} +javax.faces.converter.BigIntegerConverter.BIGINTEGER=value must be an integer +javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=value must be a signed integer number consisting of zero or more digits +javax.faces.converter.BooleanConverter.BOOLEAN=value must be true or false +javax.faces.converter.BooleanConverter.BOOLEAN_detail=value must be true or false (any value other than true will evaluate to false) +javax.faces.converter.ByteConverter.BYTE=value must be a number between 0 and 255 +javax.faces.converter.ByteConverter.BYTE_detail=value must be a number between 0 and 255 +javax.faces.converter.CharacterConverter.CHARACTER=value must be a character +javax.faces.converter.CharacterConverter.CHARACTER_detail=value must be a valid ASCII character +javax.faces.converter.DateTimeConverter.DATE=value must be a date +javax.faces.converter.DateTimeConverter.DATE_detail=value must be a date, eg. {1} +javax.faces.converter.DateTimeConverter.TIME=value must be a time +javax.faces.converter.DateTimeConverter.TIME_detail=value must be a time, eg. {1} +javax.faces.converter.DateTimeConverter.DATETIME=value must be a date and time +javax.faces.converter.DateTimeConverter.DATETIME_detail=value must be a date and time, eg. {1} +javax.faces.converter.DateTimeConverter.PATTERN_TYPE=a pattern or type attribute must be specified to convert the value +javax.faces.converter.DoubleConverter.DOUBLE=value must be a number +javax.faces.converter.DoubleConverter.DOUBLE_detail=value must be a number between 4.9E-324 and 1.7976931348623157E308 +javax.faces.converter.EnumConverter.ENUM=value must be convertible to an enum +javax.faces.converter.EnumConverter.ENUM_detail=value must be convertible to an enum or from the enum that contains the constant {1} +javax.faces.converter.EnumConverter.ENUM_NO_CLASS=value must be convertible to an enum or from the enum, but no enum class provided +javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail=value must be convertible to an enum or from the enum, but no enum class provided +javax.faces.converter.FloatConverter.FLOAT=value must be a number +javax.faces.converter.FloatConverter.FLOAT_detail=value must be a number between 1.4E-45 and 3.4028235E38 +javax.faces.converter.IntegerConverter.INTEGER=value must be an integer +javax.faces.converter.IntegerConverter.INTEGER_detail=value must be an integer number between -2147483648 and 2147483647 +javax.faces.converter.LongConverter.LONG=value must be an integer +javax.faces.converter.LongConverter.LONG_detail=must be an integer number between -9223372036854775808 and 9223372036854775807 +javax.faces.converter.NumberConverter.CURRENCY=value must be a currency amount +javax.faces.converter.NumberConverter.CURRENCY_detail=value must be a currency amount, eg. {1} +javax.faces.converter.NumberConverter.PERCENT=value must be a percentage amount +javax.faces.converter.NumberConverter.PERCENT_detail=value must be a percentage amount, eg. {1} +javax.faces.converter.NumberConverter.NUMBER=value must be a number +javax.faces.converter.NumberConverter.NUMBER_detail=value must be a number +javax.faces.converter.NumberConverter.PATTERN=value must be a number +javax.faces.converter.NumberConverter.PATTERN_detail=value must be a number +javax.faces.converter.ShortConverter.SHORT=value must be an integer +javax.faces.converter.ShortConverter.SHORT_detail=value must be an integer number between -32768 and 32767 + +javax.faces.validator.DoubleRangeValidator.MAXIMUM=value must be less than or equal to {0} +javax.faces.validator.DoubleRangeValidator.MINIMUM=value must be greater than or equal to {0} +javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE=value must be between {0} and {1} +javax.faces.validator.DoubleRangeValidator.TYPE=value is not of the correct type +javax.faces.validator.LengthValidator.MAXIMUM=value is must be shorter than or equal to {0} characters +javax.faces.validator.LengthValidator.MINIMUM=value is must be longer than or equal to {0} characters +javax.faces.validator.LongRangeValidator.MAXIMUM=value must be less than or equal to {0} +javax.faces.validator.LongRangeValidator.MINIMUM=value must be greater than or equal to {0} +javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=value must be between {0} and {1} +javax.faces.validator.LongRangeValidator.TYPE=value is not of the correct type + +javax.faces.validator.NOT_IN_RANGE=value must be between {0} and {1} +javax.faces.converter.STRING=value could not be converted to a string + +#JSF 1.1: +javax.faces.convert.BigDecimalConverter.CONVERSION value must be a number +javax.faces.convert.BigDecimalConverter.CONVERSION_detail value must be a number +javax.faces.convert.BigIntegerConverter.CONVERSION value must be an integre +javax.faces.convert.BigIntegerConverter.CONVERSION_detail value must be a number +javax.faces.convert.BooleanConverter.CONVERSION value must be true or false +javax.faces.convert.BooleanConverter.CONVERSION_detail value must be true or false +javax.faces.convert.ByteConverter.CONVERSION value must be a byte +javax.faces.convert.ByteConverter.CONVERSION_detail value must be a byte +javax.faces.convert.CharacterConverter.CONVERSION value must be a character +javax.faces.convert.CharacterConverter.CONVERSION_detail value must be a character +javax.faces.convert.DateTimeConverter.CONVERSION value must be a datetime +javax.faces.convert.DateTimeConverter.CONVERSION_detail value must be a datetime +javax.faces.convert.DoubleConverter.CONVERSION value must be a number +javax.faces.convert.DoubleConverter.CONVERSION_detail value must be a number +javax.faces.convert.FloatConverter.CONVERSION value must be a number +javax.faces.convert.FloatConverter.CONVERSION_detail value must be a number +javax.faces.convert.IntegerConverter.CONVERSION value must be an integer +javax.faces.convert.IntegerConverter.CONVERSION_detail value must be an integer +javax.faces.convert.LongConverter.CONVERSION value must be an integer +javax.faces.convert.LongConverter.CONVERSION_detail value must be a long integer +javax.faces.convert.NumberConverter.CONVERSION value must be a number +javax.faces.convert.NumberConverter.CONVERSION_detail value must be a number +javax.faces.convert.ShortConverter.CONVERSION value must be an integer +javax.faces.convert.ShortConverter.CONVERSION_detail value must be a short integer Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamJbide3845Test/src/main/messages_en.properties ___________________________________________________________________ Added: svn:mime-type + text/plain

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r31905 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7 and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-06-08 06:42:20 -0400 (Wed, 08 Jun 2011) New Revision: 31905 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-8610 and JBIDE-8611 fixing automatic detection for web port. Not optimal, but good for now. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2011-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2011-06-08 10:42:20 UTC (rev 31905) @@ -87,7 +87,9 @@ } private IStatus handleAddJBoss7XPaths(IServer server2) { - // TODO + ArrayList<XPathCategory> defaults = loadDefaults(server2, server2.getRuntime().getLocation().toOSString()); + serverToCategories.put(server2.getId(), defaults); + save(server2); return Status.OK_STATUS; } @@ -100,7 +102,7 @@ ArrayList<XPathCategory> defaults = loadDefaults(server2, configFolder.toOSString()); serverToCategories.put(server2.getId(), defaults); save(server2); - } + } } return Status.OK_STATUS; } @@ -264,6 +266,7 @@ rtToPortsFile.put(IConstants.AS_50, properties.append(IJBossToolingConstants.DEFAULT_PROPS_50)); rtToPortsFile.put(IConstants.AS_51, properties.append(IJBossToolingConstants.DEFAULT_PROPS_51)); rtToPortsFile.put(IConstants.AS_60, properties.append(IJBossToolingConstants.DEFAULT_PROPS_60)); + rtToPortsFile.put(IConstants.AS_70, properties.append(IJBossToolingConstants.DEFAULT_PROPS_70)); rtToPortsFile.put(IConstants.EAP_43, properties.append(IJBossToolingConstants.DEFAULT_PROPS_EAP_43)); rtToPortsFile.put(IConstants.EAP_50, properties.append(IJBossToolingConstants.DEFAULT_PROPS_EAP_50)); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-06-08 10:42:20 UTC (rev 31905) @@ -25,7 +25,7 @@ public void setDefaults(IProgressMonitor monitor) { super.setDefaults(monitor); setAttribute(DEPLOY_DIRECTORY_TYPE, DEPLOY_SERVER); - setAttribute(IJBossToolingConstants.WEB_PORT_DETECT, false); + setAttribute(IJBossToolingConstants.WEB_PORT_DETECT, true); setAttribute(IJBossToolingConstants.WEB_PORT, IJBossToolingConstants.JBOSS_WEB_DEFAULT_PORT); setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, JBoss7ManagerServicePoller.POLLER_ID); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-08 10:42:20 UTC (rev 31905) @@ -71,6 +71,7 @@ public static final String DEFAULT_PROPS_50 = "jboss.50.default.ports.properties"; //$NON-NLS-1$ public static final String DEFAULT_PROPS_51 = "jboss.51.default.ports.properties"; //$NON-NLS-1$ public static final String DEFAULT_PROPS_60 = "jboss.60.default.ports.properties"; //$NON-NLS-1$ + public static final String DEFAULT_PROPS_70 = "jboss.70.default.ports.properties"; //$NON-NLS-1$ public static final String DEFAULT_PROPS_EAP_43 = "jboss.eap.43.default.ports.properties"; //$NON-NLS-1$ public static final String DEFAULT_PROPS_EAP_50 = "jboss.eap.50.default.ports.properties"; //$NON-NLS-1$ Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties 2011-06-08 10:42:20 UTC (rev 31905) @@ -0,0 +1,3 @@ +JBoss_Web=//*[@name="standard-sockets"]/*[@name="http"] +JBoss_Web_FILE=standalone/configuration/standalone.xml +JBoss_Web_ATTRIBUTE=port \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-06-08 10:42:20 UTC (rev 31905) @@ -129,17 +129,6 @@ Messages.EditorChangeWebCommandName); } } - - public static class JBoss7WebPortEditorExtension extends PortEditorExtension { - public JBoss7WebPortEditorExtension() { - super(Messages.EditorWebPort, - null, - IJBossServerConstants.WEB_PORT_DETECT, - IJBossServerConstants.WEB_PORT, - null, - Messages.EditorChangeWebCommandName); - } - } public static class JBoss6JMXRMIPortEditorExtension extends PortEditorExtension { public JBoss6JMXRMIPortEditorExtension() { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-06-08 10:07:42 UTC (rev 31904) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-06-08 10:42:20 UTC (rev 31905) @@ -275,13 +275,9 @@ </section> <section class="org.jboss.ide.eclipse.as.ui.editor.PortSection$WebPortEditorExtension" - serverIds="%JBossServer6AndBelow"> + serverIds="%AllJBossServerTypes"> </section> <section - class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss7WebPortEditorExtension" - serverIds="%ServerTypesJBoss7"> - </section> - <section class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss6JMXRMIPortEditorExtension" serverIds="org.jboss.ide.eclipse.as.60"> </section>

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r31904 - in trunk/forge/plugins/org.jboss.tools.forge.ui: .settings and 15 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-06-08 06:07:42 -0400 (Wed, 08 Jun 2011) New Revision: 31904 Added: trunk/forge/plugins/org.jboss.tools.forge.ui/.classpath trunk/forge/plugins/org.jboss.tools.forge.ui/.project trunk/forge/plugins/org.jboss.tools.forge.ui/.settings/ trunk/forge/plugins/org.jboss.tools.forge.ui/.settings/org.eclipse.jdt.core.prefs trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/ trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF trunk/forge/plugins/org.jboss.tools.forge.ui/build.properties trunk/forge/plugins/org.jboss.tools.forge.ui/icons/ trunk/forge/plugins/org.jboss.tools.forge.ui/icons/start.gif trunk/forge/plugins/org.jboss.tools.forge.ui/icons/stop.gif trunk/forge/plugins/org.jboss.tools.forge.ui/lib/ trunk/forge/plugins/org.jboss.tools.forge.ui/lib/activation.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-connector-wagon.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-impl.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-spi.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-util.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/args4j.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/cal10n-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/cdi-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/common.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/commons-cli.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/commons-codec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/commons-logging.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/contenttype.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/core.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/el-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-dev-plugins.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-git-tools.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-javaee-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-javaee-impl.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-maven-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-parser-java-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-parser-java.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-parser-xml.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-project-model-maven.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-reference-guide.war trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-scaffold-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-scaffold-plugins.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-shell-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-shell.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/fpak.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/guava.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/hibernate-jpa-2.0-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/httpclient.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/httpcore.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jansi.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/javassist.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/javax.inject.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jaxrs-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-annotations-api_1.1_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-connector-api_1.5_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-ejb-api_3.1_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-el-api_2.2_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-interceptor-core.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-interceptor-spi.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-interceptors-api_1.1_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jacc-api_1.4_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jad-api_1.2_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaspi-api_1.0_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-javaee-6.0.pom trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxb-api_2.2_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxr-api_1.0_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxrpc-api_1.1_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxws-api_2.2_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jms-api_1.1_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jsp-api_2.2_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-logging.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-saaj-api_1.3_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-servlet-api_3.0_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-transaction-api_1.1_spec.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jline.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jobs.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsch.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsf-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsr181-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsr250-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jstl.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/log4j.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/mail.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-aether-provider.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-artifact.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-compat.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-core.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-embedder.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-model-builder.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-model.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-plugin-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-repository-metadata.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-settings-builder.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-settings.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/metawidget-forge.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/metawidget.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/mvel2.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.console.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.iplog.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.pgm.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.ui.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/osgi.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-cipher.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-classworlds.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-component-annotations.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-interpolation.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-sec-dispatcher.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-utils.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/preferences.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/resources.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/runtime.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/seam-render.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/seam-solder.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/shrinkwrap-descriptors-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/shrinkwrap-descriptors-impl.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/sisu-guice-no_aop.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/sisu-inject-bean.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/sisu-inject-plexus.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/slf4j-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/slf4j-ext.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/slf4j-log4j12.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/snakeyaml.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/stax-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/text.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/validation-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-file.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-http-lightweight.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-http-shared.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-provider-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-api.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-core.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-se-core.jar trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-spi.jar trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml trunk/forge/plugins/org.jboss.tools.forge.ui/src/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgePlugin.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StartDelegate.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StopDelegate.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ColorManager.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/CommandRecorder.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/Console.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleInputStream.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleOutputStream.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsolePartitioner.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/InputReadJob.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/importer/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/importer/ProjectConfigurationUpdater.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/importer/ProjectImporter.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeInstallation.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeRuntime.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/EmptyPreferencePage.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationDialog.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationLabelProvider.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationsPreferencePage.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeIntallationLabelProvider.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsolePage.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleText.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleView.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleViewer.java Log: - remove seam reference of plugin name - split forge plugin in runtime/core/ui triplet Added: trunk/forge/plugins/org.jboss.tools.forge.ui/.classpath =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/.classpath (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/.classpath 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/forge/plugins/org.jboss.tools.forge.ui/.project =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/.project (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/.project 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.forge.ui</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/forge/plugins/org.jboss.tools.forge.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/.settings/org.eclipse.jdt.core.prefs 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,8 @@ +#Fri Jan 07 16:05:07 CET 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/META-INF/MANIFEST.MF 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,22 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Forge Tools +Bundle-SymbolicName: org.jboss.tools.forge.ui;singleton:=true +Bundle-Version: 1.0.0.qualifier +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.ui.console, + org.eclipse.jface.text, + org.eclipse.debug.ui, + org.eclipse.jdt.launching, + org.eclipse.ui.editors, + org.eclipse.ui.ide, + org.eclipse.m2e.core;bundle-version="0.13.0", + org.eclipse.m2e.maven.runtime;bundle-version="0.13.0", + org.eclipse.jdt.core, + org.eclipse.ui.views +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.jboss.tools.forge.ForgePlugin +Bundle-ClassPath: ., + lib/jline.jar Added: trunk/forge/plugins/org.jboss.tools.forge.ui/build.properties =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/build.properties (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/build.properties 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,8 @@ +output.. = bin/ +bin.includes = META-INF/,\ + plugin.xml,\ + lib/,\ + icons/,\ + .,\ + lib/jline.jar +source.. = src/ Added: trunk/forge/plugins/org.jboss.tools.forge.ui/icons/start.gif =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/icons/start.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/icons/stop.gif =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/icons/stop.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/activation.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/activation.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-connector-wagon.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-connector-wagon.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-impl.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-spi.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-spi.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-util.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/aether-util.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/args4j.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/args4j.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/cal10n-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/cal10n-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/cdi-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/cdi-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/common.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/common.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/commons-cli.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/commons-cli.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/commons-codec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/commons-codec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/commons-logging.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/contenttype.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/contenttype.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/core.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/core.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/el-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/el-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-dev-plugins.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-dev-plugins.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-git-tools.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-git-tools.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-javaee-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-javaee-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-javaee-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-javaee-impl.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-maven-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-maven-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-parser-java-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-parser-java-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-parser-java.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-parser-java.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-parser-xml.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-parser-xml.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-project-model-maven.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-project-model-maven.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-reference-guide.war =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-reference-guide.war ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-scaffold-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-scaffold-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-scaffold-plugins.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-scaffold-plugins.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-shell-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-shell-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-shell.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/forge-shell.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/fpak.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/fpak.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/guava.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/guava.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/hibernate-jpa-2.0-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/hibernate-jpa-2.0-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/httpclient.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/httpclient.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/httpcore.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/httpcore.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jansi.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jansi.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/javassist.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/javassist.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/javax.inject.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/javax.inject.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jaxrs-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jaxrs-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-annotations-api_1.1_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-annotations-api_1.1_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-connector-api_1.5_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-connector-api_1.5_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-ejb-api_3.1_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-ejb-api_3.1_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-el-api_2.2_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-el-api_2.2_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-interceptor-core.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-interceptor-core.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-interceptor-spi.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-interceptor-spi.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-interceptors-api_1.1_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-interceptors-api_1.1_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jacc-api_1.4_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jacc-api_1.4_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jad-api_1.2_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jad-api_1.2_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaspi-api_1.0_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaspi-api_1.0_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-javaee-6.0.pom =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-javaee-6.0.pom (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-javaee-6.0.pom 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,176 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-specs-parent</artifactId> + <version>1.0.0.Beta2</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-javaee-6.0</artifactId> + <version>1.0.0.Final</version> + <packaging>pom</packaging> + <name>JBoss Java EE 6.0 API Aggregate</name> + <description>Java EE 6.0 APIs for use with JBoss AS 6</description> + +  + <properties> + <version.jboss.javaee6.bom>1.0.1.Final</version.jboss.javaee6.bom> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/specs/tags/jboss-...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/specs/tags/jboss-jav...</developerConnection> + <url>http://fisheye.jboss.org/browse/JBossAS/projects/specs/tags/jboss-javaee-...</url> + </scm> + +  +  +  +  +  +  +  + <repositories> + <repository> + <id>jboss-public-repository</id> + <name>JBoss Repository</name> + <url>https://repository.jboss.org/nexus/content/groups/public</url> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + </snapshots> + </repository> + </repositories> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee6-specs-bom</artifactId> + <version>${version.jboss.javaee6.bom}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.jboss.spec.javax.annotation</groupId> + <artifactId>jboss-annotations-api_1.1_spec</artifactId> + </dependency> +  + <dependency> + <groupId>org.jboss.spec.javax.resource</groupId> + <artifactId>jboss-connector-api_1.5_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_2.2_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.security.jacc</groupId> + <artifactId>jboss-jacc-api_1.4_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.enterprise.deploy</groupId> + <artifactId>jboss-jad-api_1.2_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.security.auth.message</groupId> + <artifactId>jboss-jaspi-api_1.0_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.registry</groupId> + <artifactId>jboss-jaxr-api_1.0_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.jms</groupId> + <artifactId>jboss-jms-api_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet.jsp</groupId> + <artifactId>jboss-jsp-api_2.2_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.transaction</groupId> + <artifactId>jboss-transaction-api_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.bind</groupId> + <artifactId>jboss-jaxb-api_2.2_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.rpc</groupId> + <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.soap</groupId> + <artifactId>jboss-saaj-api_1.3_spec</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>jaxrs-api</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> + </dependencies> +</project> Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxb-api_2.2_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxb-api_2.2_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxr-api_1.0_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxr-api_1.0_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxrpc-api_1.1_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxrpc-api_1.1_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxws-api_2.2_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jaxws-api_2.2_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jms-api_1.1_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jms-api_1.1_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jsp-api_2.2_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-jsp-api_2.2_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-logging.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-saaj-api_1.3_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-saaj-api_1.3_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-servlet-api_3.0_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-servlet-api_3.0_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-transaction-api_1.1_spec.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jboss-transaction-api_1.1_spec.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jline.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jline.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jobs.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jobs.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsch.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsch.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsf-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsf-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsr181-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsr181-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsr250-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jsr250-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jstl.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/jstl.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/log4j.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/log4j.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/mail.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/mail.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-aether-provider.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-aether-provider.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-artifact.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-artifact.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-compat.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-compat.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-core.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-core.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-embedder.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-embedder.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-model-builder.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-model-builder.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-model.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-model.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-plugin-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-plugin-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-repository-metadata.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-repository-metadata.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-settings-builder.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-settings-builder.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-settings.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/maven-settings.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/metawidget-forge.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/metawidget-forge.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/metawidget.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/metawidget.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/mvel2.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/mvel2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.console.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.console.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.iplog.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.iplog.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.pgm.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.pgm.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.ui.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/org.eclipse.jgit.ui.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/osgi.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/osgi.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-cipher.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-cipher.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-classworlds.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-classworlds.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-component-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-component-annotations.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-interpolation.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-interpolation.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-sec-dispatcher.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-sec-dispatcher.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-utils.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/plexus-utils.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/preferences.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/preferences.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/resources.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/resources.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/runtime.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/runtime.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/seam-render.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/seam-render.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/seam-solder.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/seam-solder.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/shrinkwrap-descriptors-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/shrinkwrap-descriptors-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/shrinkwrap-descriptors-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/shrinkwrap-descriptors-impl.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/sisu-guice-no_aop.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/sisu-guice-no_aop.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/sisu-inject-bean.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/sisu-inject-bean.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/sisu-inject-plexus.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/sisu-inject-plexus.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/slf4j-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/slf4j-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/slf4j-ext.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/slf4j-ext.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/slf4j-log4j12.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/slf4j-log4j12.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/snakeyaml.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/snakeyaml.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/stax-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/stax-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/text.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/text.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/validation-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/validation-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-file.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-file.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-http-lightweight.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-http-lightweight.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-http-shared.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-http-shared.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-provider-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/wagon-provider-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-api.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-api.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-core.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-core.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-se-core.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-se-core.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-spi.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/lib/weld-spi.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.eclipse.ui.views"> + <category + id="org.jboss.tools.forge" + name="Forge"> + </category> + <view + category="org.jboss.tools.forge" + class="org.jboss.tools.forge.view.ConsoleView" + id="org.jboss.tools.seam.forge.console" + name="Forge Console" + restorable="true"> + </view> + </extension> + <extension + point="org.eclipse.ui.viewActions"> + <viewContribution + id="org.jboss.tools.seam.forge.view" + targetID="org.jboss.tools.seam.forge.console"> + <menu + id="org.jboss.tools.seam.forge.menubar" + label="Seam Forge"> + </menu> + <action + class="org.jboss.tools.forge.action.StopDelegate" + icon="icons/stop.gif" + id="org.jboss.tools.seam.forge.stop" + label="Stop Forge" + menubarPath="org.jboss.tools.seam.forge.menubar" + style="push" + toolbarPath="org.jboss.tools.seam.forge.toolbar"> + </action> + <action + class="org.jboss.tools.forge.action.StartDelegate" + icon="icons/start.gif" + id="org.jboss.tools.seam.forge.start" + label="Start Forge" + menubarPath="org.jboss.tools.seam.forge.menu" + style="push" + toolbarPath="org.jboss.tools.seam.forge.toolbar"> + </action> + </viewContribution> + </extension> + <extension point="org.eclipse.ui.preferencePages"> + <page + name="Forge" + class="org.jboss.tools.forge.preferences.EmptyPreferencePage" + id="org.jboss.tools.seam.forge"> + </page> + <page + name="Installed Forge Runtimes" + category="org.jboss.tools.seam.forge" + class="org.jboss.tools.forge.preferences.ForgeInstallationsPreferencePage" + id="org.jboss.tools.seam.forge.runtimes"> + </page> + </extension> + +</plugin> Added: trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.2-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.forge.plugins</groupId> + <artifactId>org.jboss.tools.forge.ui</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> \ No newline at end of file Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgePlugin.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgePlugin.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ForgePlugin.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,40 @@ +package org.jboss.tools.forge; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.jboss.tools.forge.launching.ForgeRuntime; +import org.osgi.framework.BundleContext; + +public class ForgePlugin extends AbstractUIPlugin { + + public static final String PLUGIN_ID = "org.jboss.tools.seam.forge"; + + private static ForgePlugin plugin; + + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + public void stop(BundleContext context) throws Exception { + if (ForgeRuntime.INSTANCE.isForgeRunning()) { + ForgeRuntime.INSTANCE.stopForge(); + } + plugin = null; + super.stop(context); + } + + public static ForgePlugin getDefault() { + return plugin; + } + + public static void log(Throwable t) { + getDefault().getLog().log(newErrorStatus("Error logged from Forge Plugin: ", t)); + } + + private static IStatus newErrorStatus(String message, Throwable exception) { + return new Status(IStatus.ERROR, PLUGIN_ID, IStatus.INFO, message, exception); + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StartDelegate.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StartDelegate.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StartDelegate.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,28 @@ +package org.jboss.tools.forge.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IViewActionDelegate; +import org.eclipse.ui.IViewPart; +import org.jboss.tools.forge.launching.ForgeRuntime; + +public class StartDelegate implements IViewActionDelegate { + + @Override + public void run(IAction action) { + ForgeRuntime.INSTANCE.startForge(); + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + // TODO Auto-generated method stub + + } + + @Override + public void init(IViewPart view) { + // TODO Auto-generated method stub + + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StopDelegate.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StopDelegate.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/action/StopDelegate.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,28 @@ +package org.jboss.tools.forge.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IViewActionDelegate; +import org.eclipse.ui.IViewPart; +import org.jboss.tools.forge.launching.ForgeRuntime; + +public class StopDelegate implements IViewActionDelegate { + + @Override + public void run(IAction action) { + ForgeRuntime.INSTANCE.stopForge(); + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + // TODO Auto-generated method stub + + } + + @Override + public void init(IViewPart view) { + // TODO Auto-generated method stub + + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ColorManager.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ColorManager.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ColorManager.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,43 @@ +package org.jboss.tools.forge.console; + + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.RGB; +import org.eclipse.swt.widgets.Display; + +class ColorManager { + + private static ColorManager INSTANCE; + + private ColorManager() {} + + public static ColorManager getInstance() { + if (INSTANCE == null) { + INSTANCE= new ColorManager(); + } + return INSTANCE; + } + + protected Map<RGB, Color> fColorTable= new HashMap<RGB, Color>(10); + + public Color getColor(RGB rgb) { + Color color= (Color) fColorTable.get(rgb); + if (color == null) { + color= new Color(Display.getCurrent(), rgb); + fColorTable.put(rgb, color); + } + return color; + } + + public void dispose() { + Iterator<Color> e= fColorTable.values().iterator(); + while (e.hasNext()) + ((Color) e.next()).dispose(); + } +} + + Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/CommandRecorder.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/CommandRecorder.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/CommandRecorder.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,266 @@ +package org.jboss.tools.forge.console; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.ISourceRange; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jface.text.DocumentEvent; +import org.eclipse.jface.text.IDocumentListener; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.part.ISetSelectionTarget; +import org.eclipse.ui.texteditor.ITextEditor; +import org.jboss.tools.forge.ForgePlugin; +import org.jboss.tools.forge.importer.ProjectConfigurationUpdater; +import org.jboss.tools.forge.importer.ProjectImporter; + +public class CommandRecorder implements IDocumentListener { + + private StringBuffer buffer = new StringBuffer(); + private String beforePrompt = null; + private String currentPrompt = null; + private String currentCommand = null; + + @Override + public void documentAboutToBeChanged(DocumentEvent event) { + } + + @Override + public void documentChanged(DocumentEvent event) { + if (event.getLength() == 1 && "".equals(event.getText())) { + buffer.setLength(buffer.length() - 1); + } else { + buffer.append(event.getText()); + String newPrompt = getNewPrompt(); + if (newPrompt != null) { + currentPrompt = newPrompt; + beforePrompt = buffer.substring(0, buffer.length() - newPrompt.length()); + buffer.setLength(0); + if (currentCommand != null) { + postProcessCurrentCommand(); + currentCommand = null; + } + } else { + if (currentPrompt != null) { + String newCommand = getNewCommand(); + if (newCommand != null) { + currentCommand = newCommand; + } + } + } + } + } + + private String getNewPrompt() { + int lastLineBreak = buffer.lastIndexOf("\n"); + if (lastLineBreak == -1) return null; + String lastLine = buffer.substring(lastLineBreak + 1); + if (lastLine.length() == 0) return null; + if (lastLine.charAt(0) != '[') return null; + int rightBracketIndex = lastLine.indexOf(']'); + if (rightBracketIndex == -1) return null; + return lastLine.endsWith("$ ") ? lastLine : null; + } + + private String getNewCommand() { + String candidateCommand = buffer.toString(); + if ("pwd".equals(candidateCommand)) { + return "pwd"; + } else if ("new-project".equals(candidateCommand)) { + return "new-project"; + } else if ("persistence".equals(candidateCommand)) { + return "persistence"; + } else if ("entity".equals(candidateCommand)) { + return "entity"; + } else if ("field".equals(candidateCommand)) { + return "field"; + } else if ("prettyfaces".equals(candidateCommand)) { + return "prettyfaces"; + } else if ("build".equals(candidateCommand)) { + return "build"; + } else { + return null; + } + } + + private void postProcessCurrentCommand() { + IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage workbenchPage = workbenchWindow.getActivePage(); + String projectName = currentPrompt.substring(1, currentPrompt.indexOf(']')); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + if (project != null) { + try { + project.refreshLocal(IResource.DEPTH_INFINITE, null); + } catch (CoreException e) { + ForgePlugin.log(e); + } + } + if ("pwd".equals(currentCommand)) { + // do nothing + } else if ("new-project".equals(currentCommand)) { + int index = beforePrompt.lastIndexOf("***SUCCESS*** Created project ["); + if (index == -1) return; + if (index + 31 > beforePrompt.length()) return; + String str = beforePrompt.substring(index + 31); + index = str.lastIndexOf("] in new working directory ["); + if (index == -1) return; + if (index + 28 > str.length()) return; + str = str.substring(index + 28); + index = str.indexOf("]"); + if (index == -1) return; + String projectPath = str.substring(0, index); + index = projectPath.lastIndexOf('/'); + String projectDirName = projectPath.substring(index + 1); + String projectBaseDirPath = projectPath.substring(0, index); + ProjectImporter importer = new ProjectImporter(projectBaseDirPath, projectDirName); + importer.importProject(); + } else if ("persistence".equals(currentCommand)) { + int index = beforePrompt.lastIndexOf("***SUCCESS*** Installed [forge.spec.jpa] successfully.\nWrote "); + if (index == -1) return; + try { + IFile file = project.getFile("/src/main/resources/META-INF/persistence.xml"); + if (file == null) return; + Object objectToSelect = file; + IDE.openEditor(workbenchPage, file); + IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer"); + if (projectExplorer != null && projectExplorer instanceof ISetSelectionTarget) { + ((ISetSelectionTarget)projectExplorer).selectReveal(new StructuredSelection(objectToSelect)); + } + IViewPart packageExplorer = workbenchPage.findView("org.eclipse.jdt.ui.PackageExplorer"); + if (packageExplorer == null && projectExplorer == null) { + packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer"); + } + if (packageExplorer != null && packageExplorer instanceof ISetSelectionTarget) { + ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect)); + } + } catch (PartInitException e) { + ForgePlugin.log(e); + } + } else if ("entity".equals(currentCommand)) { + int index = beforePrompt.lastIndexOf("Picked up type <JavaResource>: "); + if (index == -1) return; + if (index + 31 > beforePrompt.length() -1) return; + String entityName = beforePrompt.substring(index + 31, beforePrompt.length() - 1).replace('.', '/'); + try { + IFile file = project.getFile("/src/main/java/" + entityName + ".java"); + if (file == null) return; + Object objectToSelect = file; + IDE.openEditor(workbenchPage, file); + IJavaElement javaElement = JavaCore.create(file); + if (javaElement != null && javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) { + try { + objectToSelect = ((ICompilationUnit)javaElement).getTypes()[0]; + } catch (JavaModelException e) { + ForgePlugin.log(e); + } + } + IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer"); + if (projectExplorer != null && projectExplorer instanceof ISetSelectionTarget) { + ((ISetSelectionTarget)projectExplorer).selectReveal(new StructuredSelection(objectToSelect)); + } + IViewPart packageExplorer = workbenchPage.findView("org.eclipse.jdt.ui.PackageExplorer"); + if (packageExplorer == null && projectExplorer == null) { + packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer"); + } + if (packageExplorer != null && packageExplorer instanceof ISetSelectionTarget) { + ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect)); + } + } catch (PartInitException e) { + ForgePlugin.log(e); + } + } else if ("field".equals(currentCommand)) { + try { + int index = beforePrompt.lastIndexOf("Added field to "); + if (index == -1) return; + if (index + 15 > beforePrompt.length()) return; + String str = beforePrompt.substring(index + 15); + index = str.indexOf(':'); + if (index == -1) return; + String entityName = str.substring(0, index); + str = str.substring(index); + index = str.lastIndexOf(';'); + if (index == -1) return; + str = str.substring(0, index); + index = str.lastIndexOf(' '); + if (index == -1) return; + String fieldName = str.substring(index + 1); + IFile file = project.getFile("/src/main/java/" + entityName.replace('.', '/') + ".java"); + if (file == null) return; + IEditorPart editorPart = IDE.openEditor(workbenchPage, file); + IJavaElement javaElement = JavaCore.create(file); + if (javaElement != null && javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) { + try { + IType type = ((ICompilationUnit)javaElement).getTypes()[0]; + IField field = type.getField(fieldName); + if (field != null) { + ISourceRange sourceRange = field.getSourceRange(); + if (sourceRange != null && editorPart != null && editorPart instanceof ITextEditor) { + ((ITextEditor)editorPart).selectAndReveal(sourceRange.getOffset(), sourceRange.getLength()); + } + } + } catch (JavaModelException e) { + ForgePlugin.log(e); + } + } + } catch (PartInitException e) { + ForgePlugin.log(e); + } + } else if ("prettyfaces".equals(currentCommand)) { + int index = beforePrompt.lastIndexOf("***SUCCESS*** Installed [com.ocpsoft.prettyfaces] successfully."); + if (index == -1) return; + String str = beforePrompt.substring(0, index - 1); + index = str.lastIndexOf("Wrote "); + if (index == -1) return; + if (index + 6 > str.length()) return; + str = str.substring(index + 6); + String projectLocation = project.getLocation().toString(); + index = str.lastIndexOf(projectLocation); + if (index != 0) return; + str = str.substring(projectLocation.length()); + IFile file = project.getFile(str); + if (file == null) return; + Object objectToSelect = file; + new ProjectConfigurationUpdater(project).updateProject(); + try { + IDE.openEditor(workbenchPage, file); + IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer"); + if (projectExplorer != null && projectExplorer instanceof ISetSelectionTarget) { + ((ISetSelectionTarget)projectExplorer).selectReveal(new StructuredSelection(objectToSelect)); + } + IViewPart packageExplorer = workbenchPage.findView("org.eclipse.jdt.ui.PackageExplorer"); + if (packageExplorer == null && projectExplorer == null) { + packageExplorer = workbenchPage.showView("org.eclipse.jdt.ui.PackageExplorer"); + } + if (packageExplorer != null && packageExplorer instanceof ISetSelectionTarget) { + ((ISetSelectionTarget)packageExplorer).selectReveal(new StructuredSelection(objectToSelect)); + } + } catch (PartInitException e) { + ForgePlugin.log(e); + } + } else if ("build".equals(currentCommand)) { + + } else { + + } + try { + workbenchPage.showView("org.jboss.tools.seam.forge.console").setFocus(); + } catch (PartInitException e) { + ForgePlugin.log(e); + } + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/Console.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/Console.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/Console.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,195 @@ +package org.jboss.tools.forge.console; + +import java.io.IOException; + +import org.eclipse.debug.core.DebugEvent; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.IDebugEventSetListener; +import org.eclipse.debug.core.model.IProcess; +import org.eclipse.debug.core.model.IStreamMonitor; +import org.eclipse.debug.core.model.IStreamsProxy; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.console.IConsoleDocumentPartitioner; +import org.eclipse.ui.console.IConsoleView; +import org.eclipse.ui.console.TextConsole; +import org.eclipse.ui.part.IPageBookViewPage; + +public class Console extends TextConsole implements IDebugEventSetListener { + + private ConsolePartitioner partitioner; + private ConsoleInputStream inputStream; + private ConsoleOutputStream outputStream; + private IProcess process = null; + private StreamListener outputStreamListener; + + + public Console(IProcess process) { + super("Forge Console", null, null, true); + this.process = process; + initInputStream(); + initPartitioner(); + initCommandRecorder(); + initOutputStream(); + initInputReadJob(); + } + + private void initCommandRecorder() { + getDocument().addDocumentListener(new CommandRecorder()); + } + + private void initInputStream() { + inputStream = new ConsoleInputStream(); + } + + private void initOutputStream() { + outputStream = new ConsoleOutputStream(this); + IStreamMonitor streamMonitor = getOutputStreamMonitor(); + if (streamMonitor != null) { + synchronized(streamMonitor) { + outputStreamListener = new StreamListener(outputStream); + streamMonitor.addListener(outputStreamListener); + } + } + } + + private IStreamMonitor getOutputStreamMonitor() { + IStreamMonitor streamMonitor = null; + IStreamsProxy streamsProxy = process.getStreamsProxy(); + if (streamsProxy != null) { + streamMonitor = streamsProxy.getOutputStreamMonitor(); + } + return streamMonitor; + } + + private void initInputReadJob() { + InputReadJob inputReadJob = new InputReadJob(process.getStreamsProxy(), inputStream); + inputReadJob.setSystem(true); + inputReadJob.schedule(); + } + + private void initPartitioner() { + partitioner = new ConsolePartitioner(); + partitioner.connect(getDocument()); + } + + public IPageBookViewPage createPage(IConsoleView view) { + throw new UnsupportedOperationException(); + } + + public ConsoleInputStream getInputStream() { + return inputStream; + } + + protected IConsoleDocumentPartitioner getPartitioner() { + return partitioner; + } + + public void dispose() { + super.dispose(); + partitioner.disconnect(); + closeStreams(); + disposeStreams(); + DebugPlugin.getDefault().removeDebugEventListener(this); + } + + private synchronized void closeStreams() { + try { + inputStream.close(); + outputStream.close(); +// partitioner.streamsClosed(); + } catch (IOException e) {} + } + + private synchronized void disposeStreams() { + IStreamMonitor streamMonitor = getOutputStreamMonitor(); + if (streamMonitor != null) { + synchronized(streamMonitor) { + if (outputStreamListener != null) { + streamMonitor.removeListener(outputStreamListener); + } + } + } + outputStreamListener = null; + outputStream = null; + inputStream = null; + } + + public void handleDebugEvents(DebugEvent[] events) { + for (int i = 0; i < events.length; i++) { + DebugEvent event = events[i]; + if (event.getSource().equals(process)) { + if (event.getKind() == DebugEvent.TERMINATE) { + closeStreams(); + DebugPlugin.getDefault().removeDebugEventListener(this); + } + } + } + } + + protected void init() { + super.init(); + if (process.isTerminated()) { + closeStreams(); + } else { + DebugPlugin.getDefault().addDebugEventListener(this); + } + } + + private int lastLineLength = 0; + private int lastLinePosition = 0; + private StringBuffer escapeSequence = new StringBuffer(); + private boolean escapeSequenceStarted = false; + + public void appendString(final String str) { + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + try { + for (int i = 0; i < str.length(); i++) { + char c = str.charAt(i); + if (c == '\r') continue; //ignore + if (c == '[' && escapeSequenceStarted) continue; + if (c == 27) { + escapeSequenceStarted = true; + continue; + } + if (escapeSequenceStarted) { + int type = Character.getType(c); + if (type == Character.LOWERCASE_LETTER || type == Character.UPPERCASE_LETTER) { + if (c == 'G') { + int columnNumber = Integer.valueOf(escapeSequence.toString()); + escapeSequence.setLength(0); + lastLineLength = columnNumber - 1; + escapeSequenceStarted = false; + } else if (c == 'K') { + int doclength = getDocument().getLength(); + int currentPosition = lastLinePosition + lastLineLength; + getDocument().replace(currentPosition, doclength - currentPosition, ""); + escapeSequenceStarted = false; +// } else if (c == 'm') { +// + } + } else { + escapeSequence.append(c); + } + continue; + } + if (str.charAt(i) == '\b') { + getDocument().replace(getDocument().getLength() - 1, 1, ""); + lastLineLength--; + } else { + getDocument().replace(getDocument().getLength(), 0, str.substring(i, i + 1)); + lastLineLength++; + } + if (c == '\n') { + lastLineLength = 0; + lastLinePosition = getDocument().getLength(); + } + } + } catch (BadLocationException e) {} + } + }); + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleInputStream.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleInputStream.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleInputStream.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,66 @@ +package org.jboss.tools.forge.console; + +import java.io.IOException; +import java.io.InputStream; + +public class ConsoleInputStream extends InputStream { + + private byte[] input = new byte[0]; + private int outPointer = 0; + private int size = 0; + private boolean eofSent = false; + private boolean closed = false; + + public synchronized int read() throws IOException { + waitForData(); + if (available() == -1) { + return -1; + } + + byte b = input[outPointer]; + outPointer++; + if (outPointer == input.length) { + outPointer = 0; + } + size -= 1; + return b; + } + + private void waitForData() { + while (size == 0 && !closed) { + try { + wait(); + } catch (InterruptedException e) {} + } + } + + public synchronized void appendData(String text) { + input = text.getBytes(); + size = text.length(); + outPointer = 0; + notifyAll(); + } + + public int available() throws IOException { + if (closed && eofSent) { + throw new IOException("Input Stream Closed"); + } else if (size == 0) { + if (!eofSent) { + eofSent = true; + return -1; + } + throw new IOException("Input Stream Closed"); + } + + return size; + } + + public synchronized void close() throws IOException { + if(closed) { + throw new IOException("Input Stream Closed"); + } + closed = true; + notifyAll(); + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleOutputStream.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleOutputStream.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsoleOutputStream.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,59 @@ +package org.jboss.tools.forge.console; + +import java.io.IOException; +import java.io.OutputStream; + +public class ConsoleOutputStream extends OutputStream { + + private boolean closed = false; + private Console console; + + ConsoleOutputStream(Console console) { + this.console = console; + } + + public synchronized boolean isClosed() { + return closed; + } + + public synchronized void close() throws IOException { + if(closed) { + throw new IOException("Output Stream is closed"); + } + closed = true; + console = null; + } + + public void flush() throws IOException { + if(closed) { + throw new IOException("Output Stream is closed"); + } + } + + public void write(byte[] b, int off, int len) throws IOException { + if(closed) { + throw new IOException("Output Stream is closed"); + } + notifyPartitioner(new String(b, off, len)); + } + + public void write(byte[] b) throws IOException { + write(b, 0, b.length); + } + + public void write(int b) throws IOException { + write(new byte[] {(byte)b}, 0, 1); + } + + public synchronized void write(String str) throws IOException { + if(closed) { + throw new IOException("Output Stream is closed"); + } + notifyPartitioner(str); + } + + private void notifyPartitioner(String str) throws IOException { + console.appendString(str); + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsolePartitioner.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsolePartitioner.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/ConsolePartitioner.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,69 @@ +package org.jboss.tools.forge.console; + +import org.eclipse.jface.text.DocumentEvent; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.swt.custom.StyleRange; +import org.eclipse.ui.console.IConsoleDocumentPartitioner; + +public class ConsolePartitioner implements IConsoleDocumentPartitioner { + + @Override + public void connect(IDocument document) { +// System.out.println("connect"); + document.setDocumentPartitioner(this); + } + + @Override + public void disconnect() { +// System.out.println("disconnect"); + } + + @Override + public void documentAboutToBeChanged(DocumentEvent event) { +// System.out.println("documentAboutToBeChanged"); + } + + @Override + public boolean documentChanged(DocumentEvent event) { +// System.out.println("documentChanged"); + return false; + } + + @Override + public String[] getLegalContentTypes() { +// System.out.println("getLegalContentTypes"); + return null; + } + + @Override + public String getContentType(int offset) { +// System.out.println("getContentType"); + return null; + } + + @Override + public ITypedRegion[] computePartitioning(int offset, int length) { +// System.out.println("computePartitioning"); + return null; + } + + @Override + public ITypedRegion getPartition(int offset) { +// System.out.println("getPartition"); + return null; + } + + @Override + public boolean isReadOnly(int offset) { +// System.out.println("isReadOnly"); + return false; + } + + @Override + public StyleRange[] getStyleRanges(int offset, int length) { +// System.out.println("getStyleRanges : [offset, " + offset + "] [length, " + length + "]"); + return null; + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/InputReadJob.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/InputReadJob.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/InputReadJob.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,38 @@ +package org.jboss.tools.forge.console; + +import java.io.IOException; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.debug.core.model.IStreamsProxy; +import org.jboss.tools.forge.ForgePlugin; + +class InputReadJob extends Job { + + private IStreamsProxy streamsProxy; + private ConsoleInputStream input; + + InputReadJob(IStreamsProxy streamsProxy, ConsoleInputStream input) { + super("Forge Console Input Job"); + this.input = input; + this.streamsProxy = streamsProxy; + } + + protected IStatus run(IProgressMonitor monitor) { + try { + StringBuffer buffer = new StringBuffer(); + int read; + while (input != null && (read = input.read()) != -1) { + buffer.append((char)read); + streamsProxy.write(buffer.toString()); + buffer.setLength(0); + } + } catch (IOException e) { + ForgePlugin.log(e); + } + return Status.OK_STATUS; + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/console/StreamListener.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,44 @@ +package org.jboss.tools.forge.console; + +import java.io.IOException; + +import org.eclipse.debug.core.IStreamListener; +import org.eclipse.debug.core.model.IStreamMonitor; +import org.jboss.tools.forge.ForgePlugin; + +class StreamListener implements IStreamListener { + + private ConsoleOutputStream stream; + private StringBuffer buffer = new StringBuffer(); + private boolean creatingProject = false; + + StreamListener(ConsoleOutputStream stream) { + this.stream = stream; + } + + public void streamAppended(String text, IStreamMonitor streamMonitor) { + try { + buffer.append(text); + if (buffer.indexOf("new-project") != -1) { + creatingProject = true; + } + stream.write(text); + if (creatingProject + && (text.indexOf('\n') != -1) + && (buffer.indexOf("Created project [") != -1) + && (buffer.indexOf("] in new working directory [") != -1)) { + postProcessCreatedProject(buffer.toString()); + creatingProject = false; + buffer = new StringBuffer(); + } + } catch (IOException e) { + ForgePlugin.log(e); + } + } + + private void postProcessCreatedProject(String command) { + System.out.println("processing created project: \n" + command); + } + +} + Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/importer/ProjectConfigurationUpdater.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/importer/ProjectConfigurationUpdater.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/importer/ProjectConfigurationUpdater.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,37 @@ +package org.jboss.tools.forge.importer; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.WorkspaceJob; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.m2e.core.MavenPlugin; + +public class ProjectConfigurationUpdater { + + private IProject project; + + public ProjectConfigurationUpdater(IProject project) { + this.project = project; + } + + public void updateProject() { + Job job = new WorkspaceJob("Importing Forge project") { + public IStatus runInWorkspace(IProgressMonitor monitor) { + try { + MavenPlugin.getProjectConfigurationManager().updateProjectConfiguration( + project, + monitor); + } catch(CoreException ex) { + return ex.getStatus(); + } + return Status.OK_STATUS; + } + }; + job.setRule(MavenPlugin.getProjectConfigurationManager().getRule()); + job.schedule(); + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/importer/ProjectImporter.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/importer/ProjectImporter.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/importer/ProjectImporter.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,67 @@ +package org.jboss.tools.forge.importer; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; + +import org.apache.maven.model.Model; +import org.eclipse.core.resources.WorkspaceJob; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.m2e.core.MavenPlugin; +import org.eclipse.m2e.core.project.MavenProjectInfo; +import org.eclipse.m2e.core.project.ProjectImportConfiguration; + + +public class ProjectImporter { + + private String baseDirPath; + private String projectName; + + public ProjectImporter(String baseDirPath, String projectName) { + this.baseDirPath = baseDirPath; + this.projectName = projectName; + } + + public void importProject() { + Job job = new WorkspaceJob("Importing Forge project") { + public IStatus runInWorkspace(IProgressMonitor monitor) { + try { + MavenPlugin.getProjectConfigurationManager().importProjects( + getProjectToImport(), + new ProjectImportConfiguration(), + monitor); + } catch(CoreException ex) { + return ex.getStatus(); + } + return Status.OK_STATUS; + } + }; + job.setRule(MavenPlugin.getProjectConfigurationManager().getRule()); + job.schedule(); + } + + private MavenProjectInfo createMavenProjectInfo() { + MavenProjectInfo result = null; + try { + File projectDir = new File(baseDirPath, projectName); + File pomFile = new File(projectDir, "pom.xml"); + Model model = MavenPlugin.getMavenModelManager().readMavenModel(pomFile); + String pomName = projectName + "/" + "pom.xml"; + result = new MavenProjectInfo(pomName, pomFile, model, null); + } catch (CoreException e) { + + } + return result; + } + + private Collection<MavenProjectInfo> getProjectToImport() { + ArrayList<MavenProjectInfo> result = new ArrayList<MavenProjectInfo>(1); + result.add(createMavenProjectInfo()); + return result; + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeInstallation.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeInstallation.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeInstallation.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,29 @@ +package org.jboss.tools.forge.launching; + +public class ForgeInstallation { + + private String name; + private String location; + + public ForgeInstallation(String name, String location) { + this.name = name; + this.location = location; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeRuntime.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/launching/ForgeRuntime.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,378 @@ +package org.jboss.tools.forge.launching; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.debug.core.DebugEvent; +import org.eclipse.debug.core.DebugException; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.IDebugEventSetListener; +import org.eclipse.debug.core.ILaunch; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchConfigurationType; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.debug.core.model.IProcess; +import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +import org.eclipse.jdt.launching.IRuntimeClasspathEntry; +import org.eclipse.jdt.launching.JavaRuntime; +import org.jboss.tools.forge.ForgePlugin; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; + +public class ForgeRuntime implements IDebugEventSetListener { + + private static final String PREF_FORGE_INSTALLATIONS = "installations"; + + private static List<ForgeInstallation> installations = null; + private static ForgeInstallation defaultInstallation = null; + + public static ForgeInstallation[] getInstallations() { + if (installations == null) { + initializeInstallations(); + } + return (ForgeInstallation[])installations.toArray(new ForgeInstallation[installations.size()]); + } + + public static ForgeInstallation getDefaultInstallation() { + if (installations == null) { + initializeInstallations(); + } + return defaultInstallation; + } + + private static void initializeInstallations() { + String installPrefsXml = ForgePlugin.getDefault().getPreferenceStore().getString(PREF_FORGE_INSTALLATIONS); + if (installPrefsXml == null || "".equals(installPrefsXml)) { + createInitialInstallations(); + installPrefsXml = ForgePlugin.getDefault().getPreferenceStore().getString(PREF_FORGE_INSTALLATIONS); + } + initializeFromXml(installPrefsXml); + } + + private static void initializeFromXml(String installPrefsXml) { + if (installPrefsXml == null) return; + DocumentBuilder documentBuilder = newDocumentBuilder(); + if (documentBuilder == null) return; + InputStream inputStream = createInputStream(installPrefsXml); + if (inputStream == null) return; + installations = new ArrayList<ForgeInstallation>(); + Document document = parseInstallations(documentBuilder, inputStream); + Element installationsElement = document.getDocumentElement(); + String defaultInstallationName = installationsElement.getAttribute("default"); + NodeList nodeList = installationsElement.getChildNodes(); + for (int i = 0; i < nodeList.getLength(); i++) { + Node node = nodeList.item(i); + if (node.getNodeType() == Node.ELEMENT_NODE) { + Element element = (Element)node; + String name = element.getAttribute("name"); + String location = element.getAttribute("location"); + ForgeInstallation newInstallation = new ForgeInstallation(name, location); + installations.add(newInstallation); + if (name.equals(defaultInstallationName)) { + defaultInstallation = newInstallation; + } + } + } + } + + private static Document parseInstallations(DocumentBuilder documentBuilder, InputStream inputStream) { + Document result = null; + try { + result = documentBuilder.parse(inputStream); + } catch (SAXException e) { + ForgePlugin.log(e); + } catch (IOException e) { + ForgePlugin.log(e); + } + return result; + } + + private static InputStream createInputStream(String string) { + InputStream result = null; + try { + result = new BufferedInputStream(new ByteArrayInputStream(string.getBytes("UTF8"))); + } catch (UnsupportedEncodingException e) { + ForgePlugin.log(e); + } + return result; + } + + private static DocumentBuilder newDocumentBuilder() { + try { + return DocumentBuilderFactory.newInstance().newDocumentBuilder(); + } catch (ParserConfigurationException e) { + ForgePlugin.log(e); + return null; + } + } + + private static Document createEmptyDocument() { + DocumentBuilder documentBuilder = newDocumentBuilder(); + if (documentBuilder == null) { + return null; + } else { + return documentBuilder.newDocument(); + } + } + + private static String serializeDocument(Document doc) throws TransformerException, IOException { + ByteArrayOutputStream s = new ByteArrayOutputStream(); + TransformerFactory factory = TransformerFactory.newInstance(); + Transformer transformer = factory.newTransformer(); + transformer.setOutputProperty(OutputKeys.METHOD, "xml"); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); + DOMSource source = new DOMSource(doc); + StreamResult outputTarget = new StreamResult(s); + transformer.transform(source, outputTarget); + return s.toString("UTF8"); + } + + private static void createInitialInstallations() { + try { + File file = FileLocator.getBundleFile(ForgePlugin.getDefault().getBundle()); + defaultInstallation = new ForgeInstallation("embedded", file.getAbsolutePath()); + installations = new ArrayList<ForgeInstallation>(); + installations.add(defaultInstallation); + saveInstallations(); + } catch (IOException e) { + ForgePlugin.log(e); + } + } + + public static void setInstallations(ForgeInstallation[] installs, ForgeInstallation defaultInstall) { + installations.clear(); + for (ForgeInstallation install : installs) { + installations.add(install); + } + defaultInstallation = defaultInstall; + saveInstallations(); + } + + private static void saveInstallations() { + try { + String xml = serializeDocument(createInstallationsDocument()); + ForgePlugin.getDefault().getPreferenceStore().setValue(PREF_FORGE_INSTALLATIONS, xml); + } catch (IOException e) { + ForgePlugin.log(e); + } catch (TransformerException e) { + ForgePlugin.log(e); + } + } + + private static Document createInstallationsDocument() { + Document document = createEmptyDocument(); + if (document == null) return null; + Element main = document.createElement("forgeInstallations"); + document.appendChild(main); + for (ForgeInstallation installation : installations) { + Element element = document.createElement("installation"); + element.setAttribute("name", installation.getName()); + element.setAttribute("location", installation.getLocation()); + main.appendChild(element); + } + main.setAttribute("default", defaultInstallation.getName()); + return document; + } + + + public static final ForgeRuntime INSTANCE = new ForgeRuntime(); + public static final String STATE_NOT_RUNNING = "org.jboss.tools.seam.forge.notRunning"; + public static final String STATE_RUNNING = "org.jboss.tools.seam.forge.running"; + public static final String STATE_STARTING = "org.jboss.tools.seam.forge.starting"; + public static final String STATE_STOPPING = "org.jboss.tools.seam.forge.stopping"; + + private IProcess forgeProcess = null; + private String runtimeState = STATE_NOT_RUNNING; + private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this); + + private ForgeRuntime() {} + + public boolean isForgeRunning() { + return forgeProcess != null && !forgeProcess.isTerminated(); + } + + public void startForge() { + try { + if (!isForgeRunning()) { + setRuntimeState(STATE_STARTING); + ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager(); + ILaunchConfigurationType type = manager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION); + ILaunchConfiguration[] configurations = manager.getLaunchConfigurations(type); + for (int i = 0; i < configurations.length; i++) { + ILaunchConfiguration configuration = configurations[i]; + if (configuration.getName().equals("Seam Forge")) { + configuration.delete(); + break; + } + } + ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, "Forge"); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.jboss.forge.shell.Bootstrap"); + List<String> classpath = new ArrayList<String>(); +// Bundle bundle = Platform.getBundle("org.jboss.tools.seam.forge"); + File file = null; +// try { +// file = FileLocator.getBundleFile(bundle); + file = new File(ForgeRuntime.getDefaultInstallation().getLocation()); +// } catch (IOException e1) { +// e1.printStackTrace(); +// } +// if (file == null) return; + if (!file.exists()) { + ForgePlugin.log(new RuntimeException("Not a correct Forge runtime.")); + setRuntimeState(STATE_NOT_RUNNING); + return; + } + File[] children = file.listFiles(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.endsWith("lib"); + } + }); + if (children.length != 1) { + ForgePlugin.log(new RuntimeException("Not a correct Forge runtime.")); + setRuntimeState(STATE_NOT_RUNNING); + return; + } + File forgeLibDir = children[0]; + + File[] forgeLibFiles = forgeLibDir.listFiles(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.endsWith("jar"); + } + }); + for (File libFile: forgeLibFiles) { + IRuntimeClasspathEntry entry = JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(libFile.getAbsolutePath())); + entry.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES); + classpath.add(entry.getMemento()); + } + IPath systemLibsPath = new Path(JavaRuntime.JRE_CONTAINER); + IRuntimeClasspathEntry systemLibsEntry = JavaRuntime.newRuntimeContainerClasspathEntry( + systemLibsPath, + IRuntimeClasspathEntry.STANDARD_CLASSES); + classpath.add(systemLibsEntry.getMemento()); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, classpath); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IWorkspaceRoot root = workspace.getRoot(); + IPath path = root.getLocation(); + File workingDir = path.toFile(); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, workingDir.getAbsolutePath()); +// workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "-Dseam.forge.shell.colorEnabled=true"); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "-Dforge.compatibility.IDE=true"); + ILaunchConfiguration configuration = workingCopy.doSave(); + ILaunch launch = configuration.launch(ILaunchManager.RUN_MODE, null, false, false); + IProcess[] processes = launch.getProcesses(); + if (processes.length == 1) { + forgeProcess = processes[0]; + } + DebugPlugin.getDefault().addDebugEventListener(this); + setRuntimeState(STATE_RUNNING); + } + } catch (CoreException e) { + ForgePlugin.log(e); + } + } + + public void stopForge() { + if (isForgeRunning()) { + setRuntimeState(STATE_STOPPING); + try { + forgeProcess.terminate(); + } catch (DebugException e) { + e.printStackTrace(); + } + setRuntimeState(STATE_NOT_RUNNING); + DebugPlugin.getDefault().removeDebugEventListener(this); + } + } + + public void setRuntimeState(String newRuntimeState) { + String oldRuntimeState = this.runtimeState; + this.runtimeState = newRuntimeState; + propertyChangeSupport.firePropertyChange( + new PropertyChangeEvent( + this, + "runtimeState", + oldRuntimeState, + newRuntimeState)); + } + + public String getRuntimeState() { + return runtimeState; + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + propertyChangeSupport.addPropertyChangeListener("runtimeState", listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + propertyChangeSupport.removePropertyChangeListener("runtimeState", listener); + } + + protected void finalize() throws Throwable { + if (forgeProcess != null) { + if (!forgeProcess.isTerminated()) { + forgeProcess.terminate(); + } + forgeProcess = null; + } + super.finalize(); + } + + public IProcess getProcess() { + return forgeProcess; + } + + @Override + public void handleDebugEvents(DebugEvent[] events) { + for (int i = 0; i < events.length; i++) { + DebugEvent event = events[i]; + if (event.getSource().equals(getProcess())) { + if (event.getKind() == DebugEvent.TERMINATE) { + if (forgeProcess.isTerminated()) { + DebugPlugin.getDefault().asyncExec(new Runnable() { + public void run() { + setRuntimeState(STATE_NOT_RUNNING); + } + }); + } + DebugPlugin.getDefault().removeDebugEventListener(this); + } + } + } + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartition.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,166 @@ +package org.jboss.tools.forge.old; + +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.swt.custom.StyleRange; +import org.eclipse.ui.console.ConsolePlugin; +import org.jboss.tools.forge.console.ConsoleInputStream; +import org.jboss.tools.forge.console.ConsoleOutputStream; + +public class ConsolePartition implements ITypedRegion { + public static final String OUTPUT_PARTITION_TYPE = ConsolePlugin.getUniqueIdentifier() + ".io_console_output_partition_type"; //$NON-NLS-1$ + public static final String INPUT_PARTITION_TYPE = ConsolePlugin.getUniqueIdentifier() + ".io_console_input_partition_type"; //$NON-NLS-1$ + + /** + * The data contained by this partition. + */ + private StringBuffer buffer; + private String type; + private int offset; + /** + * Output partitions are all read only. + * Input partitions are read only once they have been appended to the console's input stream. + */ + private boolean readOnly; + + /** + * Only one of inputStream or outputStream will be null depending on the partitions type. + */ + private ConsoleOutputStream outputStream; + @SuppressWarnings("unused") + private ConsoleInputStream inputStream; + private int length; + + /** + * Creates a new partition to contain output to console. + */ + public ConsolePartition(ConsoleOutputStream outputStream, int length) { + this.outputStream = outputStream; + this.length = length; + this.type = OUTPUT_PARTITION_TYPE; + this.readOnly = true; + } + + /** + * Creates a new partition to contain input from a console + */ + public ConsolePartition(ConsoleInputStream inputStream, String text) { + this.inputStream = inputStream; + buffer = new StringBuffer(text); + length = text.length(); + this.type = INPUT_PARTITION_TYPE; + this.readOnly = false; + } + + /** + * Inserts a string into this partition. + * @param s The string to insert + * @param offset the offset in the partition + */ + public void insert(String s, int insertOffset) { + buffer.insert(insertOffset, s); + length += s.length(); + } + + /** + * Deletes data from this partition. + * @param delOffset + * @param delLength + */ + public void delete(int delOffset, int delLength) { + buffer.delete(delOffset, delOffset+delLength); + length -= delLength; + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.ITypedRegion#getType() + */ + public String getType() { + return type; + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IRegion#getLength() + */ + public int getLength() { + return length; + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IRegion#getOffset() + */ + public int getOffset() { + return offset; + } + + /** + * Sets this partitions offset in the document. + * + * @param offset This partitions offset in the document. + */ + public void setOffset(int offset) { + this.offset = offset; + } + + /** + * Sets this partition's length. + * + * @param length + */ + public void setLength(int length) { + this.length = length; + } + + /** + * Returns the data contained in this partition. + * @return The data contained in this partition. + */ + public String getString() { + return buffer.toString(); + } + + /** + * Returns a StyleRange object which may be used for setting the style + * of this partition in a viewer. + */ + public StyleRange getStyleRange(int rangeOffset, int rangeLength) { + return new StyleRange(rangeOffset, rangeLength, null, null); + } + + /** + * Returns if this partition is read-only. + * + * @see org.eclipse.ui.console.IConsoleDocumentPartitioner#isReadOnly(int) + * @return if this partition is read-only + */ + public boolean isReadOnly() { + return readOnly; + } + + /** + * Sets the read-only state of this partition to <code>true</code>. + * + * @see org.eclipse.ui.console.IConsoleDocumentPartitioner#isReadOnly(int) + */ + public void setReadOnly() { + readOnly = true; + } + + /** + * Clears the contents of the buffer + */ + public void clearBuffer() { + buffer.setLength(0); + } + + /** + * Returns the underlying output stream + * + * @return the underlying output stream + */ + ConsoleOutputStream getStream() { + return outputStream; + } +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/old/ConsolePartitioner.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,697 @@ +package org.jboss.tools.forge.old; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.IJobManager; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.DocumentEvent; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IDocumentPartitionerExtension; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.swt.custom.StyleRange; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.console.ConsolePlugin; +import org.eclipse.ui.console.IConsoleDocumentPartitioner; +import org.eclipse.ui.progress.UIJob; +import org.eclipse.ui.progress.WorkbenchJob; +import org.jboss.tools.forge.console.Console; +import org.jboss.tools.forge.console.ConsoleInputStream; +import org.jboss.tools.forge.console.ConsoleOutputStream; + +/** + * Partitions an IOConsole's document + * @since 3.1 + * + */ +@SuppressWarnings(value = { "rawtypes", "unchecked" }) +public class ConsolePartitioner implements IConsoleDocumentPartitioner, IDocumentPartitionerExtension { + + private PendingPartition consoleClosedPartition; + private IDocument document; + private ArrayList partitions; + /** + * Blocks of data that have not yet been appended to the document. + */ + private ArrayList pendingPartitions; + /** + * A list of PendingPartitions to be appended by the updateJob + */ + private ArrayList updatePartitions; + /** + * The last partition appended to the document + */ + private ConsolePartition lastPartition; + /** + * Job that appends pending partitions to the document. + */ + private QueueProcessingJob queueJob; + /** + * The input stream attached to this document. + */ + private ConsoleInputStream inputStream; + /** + * Flag to indicate that the updateJob is updating the document. + */ + private boolean updateInProgress; + /** + * A list of partitions containing input from the console, that have + * not been appended to the input stream yet. + */ + private ArrayList inputPartitions; + /** + * offset used by updateJob + */ + private int firstOffset; + /** + * An array of legal line delimiters + */ + @SuppressWarnings("unused") + private String[] lld; + private int highWaterMark = -1; + private int lowWaterMark = -1; + private boolean connected = false; + + private Console console; + + private TrimJob trimJob = new TrimJob(); + /** + * Lock for appending to and removing from the document - used + * to synchronize addition of new text/partitions in the update + * job and handling buffer overflow/clearing of the console. + */ + private Object overflowLock = new Object(); + + + private int fBuffer; + + private ConsolePartitioner(ConsoleInputStream inputStream, Console console) { + this.inputStream = inputStream; + this.console = console; + trimJob.setRule(console.getSchedulingRule()); + } + + public IDocument getDocument() { + return document; + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IDocumentPartitioner#connect(org.eclipse.jface.text.IDocument) + */ + public void connect(IDocument doc) { + document = doc; + document.setDocumentPartitioner(this); + lld = document.getLegalLineDelimiters(); + partitions = new ArrayList(); + pendingPartitions = new ArrayList(); + inputPartitions = new ArrayList(); + queueJob = new QueueProcessingJob(); + queueJob.setSystem(true); + queueJob.setPriority(Job.INTERACTIVE); + queueJob.setRule(console.getSchedulingRule()); + connected = true; + } + + public int getHighWaterMark() { + return highWaterMark; + } + + public int getLowWaterMark() { + return lowWaterMark; + } + + public void setWaterMarks(int low, int high) { + lowWaterMark = low; + highWaterMark = high; + ConsolePlugin.getStandardDisplay().asyncExec(new Runnable() { + public void run() { + checkBufferSize(); + } + }); + } + + /** + * Notification from the console that all of its streams have been closed. + */ + public void streamsClosed() { + consoleClosedPartition = new PendingPartition(null, null); + synchronized (pendingPartitions) { + pendingPartitions.add(consoleClosedPartition); + } + queueJob.schedule(); //ensure that all pending partitions are processed. + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IDocumentPartitioner#disconnect() + */ + public void disconnect() { + synchronized (overflowLock) { + document = null; + partitions.clear(); + connected = false; + try { + inputStream.close(); + } catch (IOException e) { + } + } + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IDocumentPartitioner#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) + */ + public void documentAboutToBeChanged(DocumentEvent event) { + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IDocumentPartitioner#documentChanged(org.eclipse.jface.text.DocumentEvent) + */ + public boolean documentChanged(DocumentEvent event) { + return documentChanged2(event) != null; + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IDocumentPartitioner#getLegalContentTypes() + */ + public String[] getLegalContentTypes() { + return new String[] { ConsolePartition.OUTPUT_PARTITION_TYPE, ConsolePartition.INPUT_PARTITION_TYPE }; + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IDocumentPartitioner#getContentType(int) + */ + public String getContentType(int offset) { + return getPartition(offset).getType(); + } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IDocumentPartitioner#computePartitioning(int, int) + */ + public ITypedRegion[] computePartitioning(int offset, int length) { + int rangeEnd = offset + length; + int left= 0; + int right= partitions.size() - 1; + int mid= 0; + ConsolePartition position= null; + + if (left == right) { + return new ConsolePartition[]{(ConsolePartition) partitions.get(0)}; + } + while (left < right) { + + mid= (left + right) / 2; + + position= (ConsolePartition) partitions.get(mid); + if (rangeEnd < position.getOffset()) { + if (left == mid) + right= left; + else + right= mid -1; + } else if (offset > (position.getOffset() + position.getLength() - 1)) { + if (right == mid) + left= right; + else + left= mid +1; + } else { + left= right= mid; + } + } + + + List list = new ArrayList(); + int index = left - 1; + if (index >= 0) { + position= (ConsolePartition) partitions.get(index); + while (index >= 0 && (position.getOffset() + position.getLength()) > offset) { + index--; + if (index >= 0) { + position= (ConsolePartition) partitions.get(index); + } + } + } + index++; + position= (ConsolePartition) partitions.get(index); + while (index < partitions.size() && (position.getOffset() < rangeEnd)) { + list.add(position); + index++; + if (index < partitions.size()) { + position= (ConsolePartition) partitions.get(index); + } + } + + return (ITypedRegion[]) list.toArray(new ConsolePartition[list.size()]); + } + + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.IDocumentPartitioner#getPartition(int) + */ + public ITypedRegion getPartition(int offset) { + for (int i = 0; i < partitions.size(); i++) { + ITypedRegion partition = (ITypedRegion) partitions.get(i); + int start = partition.getOffset(); + int end = start + partition.getLength(); + if (offset >= start && offset < end) { + return partition; + } + } + + if (lastPartition == null) { + synchronized(partitions) { + lastPartition = new ConsolePartition(inputStream, ""); //$NON-NLS-1$ + lastPartition.setOffset(offset); + partitions.add(lastPartition); + inputPartitions.add(lastPartition); + } + } + return lastPartition; + } + + /** + * Enforces the buffer size. + * When the number of lines in the document exceeds the high water mark, the + * beginning of the document is trimmed until the number of lines equals the + * low water mark. + */ + private void checkBufferSize() { + if (document != null && highWaterMark > 0) { + int length = document.getLength(); + if (length > highWaterMark) { + if (trimJob.getState() == Job.NONE) { //if the job isn't already running + trimJob.setOffset(length - lowWaterMark); + trimJob.schedule(); + } + } + } + } + + /** + * Clears the console + */ + public void clearBuffer() { + synchronized (overflowLock) { + trimJob.setOffset(-1); + trimJob.schedule(); + } + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.text.IDocumentPartitionerExtension#documentChanged2(org.eclipse.jface.text.DocumentEvent) + */ + public IRegion documentChanged2(DocumentEvent event) { + System.out.println("documentChanged2 : " + event.fText); + if (document == null) { + return null; //another thread disconnected the partitioner + } + if (document.getLength() == 0) { //document cleared + if (lastPartition != null && lastPartition.getType().equals(ConsolePartition.INPUT_PARTITION_TYPE)) { + synchronized (partitions) { + partitions.remove(lastPartition); + inputPartitions.remove(lastPartition); + } + } + lastPartition = null; + return new Region(0, 0); + } + + + if (updateInProgress) { + synchronized(partitions) { + if (updatePartitions != null) { + for (Iterator i = updatePartitions.iterator(); i.hasNext(); ) { + PendingPartition pp = (PendingPartition) i.next(); + if (pp == consoleClosedPartition) { + continue; + } + + int ppLen = pp.text.length(); + if (lastPartition != null && lastPartition.getStream() == pp.stream) { + int len = lastPartition.getLength(); + lastPartition.setLength(len + ppLen); + } else { + ConsolePartition partition = new ConsolePartition(pp.stream, ppLen); + partition.setOffset(firstOffset); + lastPartition = partition; + partitions.add(partition); + } + firstOffset += ppLen; + } + } + } + } else {// user input. + int amountDeleted = event.getLength() ; + + if (amountDeleted > 0) { + int offset = event.fOffset; + ConsolePartition partition = (ConsolePartition) getPartition(offset); + if(partition == lastPartition) { + partition.delete(event.fOffset-partition.getOffset(), amountDeleted); + } + } + + synchronized(partitions) { + if (lastPartition == null || lastPartition.isReadOnly()) { + lastPartition = new ConsolePartition(inputStream, event.fText); + lastPartition.setOffset(event.fOffset); + partitions.add(lastPartition); + inputPartitions.add(lastPartition); + } else { + lastPartition.insert(event.fText, (event.fOffset-lastPartition.getOffset())); + } + + int lastLineDelimiter = -1; + String partitionText = lastPartition.getString(); + lastLineDelimiter = partitionText.length(); +// for (int i = 0; i < lld.length; i++) { +// String ld = lld[i]; +// int index = partitionText.lastIndexOf(ld); +// if (index != -1) { +// index += ld.length(); +// } +// if (index > lastLineDelimiter) { +// lastLineDelimiter = index; +// } +// } + if (lastLineDelimiter != -1) { + StringBuffer input = new StringBuffer(); + Iterator it = inputPartitions.iterator(); + while (it.hasNext()) { + ConsolePartition partition = (ConsolePartition) it.next(); + if (partition.getOffset() + partition.getLength() <= event.fOffset + lastLineDelimiter) { + if (partition == lastPartition) { + lastPartition = null; + } + input.append(partition.getString()); + partition.clearBuffer(); + partition.setReadOnly(); + it.remove(); + } else { + //create a new partition containing everything up to the line delimiter + //and append that to the string buffer. + String contentBefore = partitionText.substring(0, lastLineDelimiter); + ConsolePartition newPartition = new ConsolePartition(inputStream, contentBefore); + newPartition.setOffset(partition.getOffset()); + newPartition.setReadOnly(); + newPartition.clearBuffer(); + int index = partitions.indexOf(partition); + partitions.add(index, newPartition); + input.append(contentBefore); + //delete everything that has been appended to the buffer. + partition.delete(0, lastLineDelimiter); + partition.setOffset(lastLineDelimiter + partition.getOffset()); + lastLineDelimiter = 0; + } + } + if (input.length() > 0) { + System.out.println("append text not!"); + //inputStream.appendData(input.toString()); + } + + } + } + } + + return new Region(event.fOffset, event.fText.length()); + } + + private void setUpdateInProgress(boolean b) { + updateInProgress = b; + } + + /** + * A stream has been appended, add to pendingPartions list and schedule updateJob. + * updateJob is scheduled with a slight delay, this allows the console to run the job + * less frequently and update the document with a greater amount of data each time + * the job is run + * @param stream The stream that was written to. + * @param s The string that should be appended to the document. + */ + public void streamAppended(ConsoleOutputStream stream, String s) throws IOException { + System.out.println("streamAppended : " + s); + if (s.indexOf('\t') != -1) System.out.println("Got a tab!"); + if (document == null) { + throw new IOException("Document is closed"); //$NON-NLS-1$ + } + synchronized(pendingPartitions) { + PendingPartition last = (PendingPartition) (pendingPartitions.size() > 0 ? pendingPartitions.get(pendingPartitions.size()-1) : null); + if (last != null && last.stream == stream) { + last.append(s); + } else { + pendingPartitions.add(new PendingPartition(stream, s)); + if (fBuffer > 1000) { + queueJob.schedule(); + } else { + queueJob.schedule(50); + } + } + + if (fBuffer > 160000) { + if(Display.getCurrent() == null){ + try { + pendingPartitions.wait(); + } catch (InterruptedException e) { + } + } else { + /* + * if we are in UI thread we cannot lock it, so process + * queued output. + */ + processQueue(); + } + } + } + } + + /** + * Holds data until updateJob can be run and the document can be updated. + */ + private class PendingPartition { + StringBuffer text = new StringBuffer(8192); + ConsoleOutputStream stream; + + PendingPartition(ConsoleOutputStream stream, String text) { + this.stream = stream; + if (text != null) { + append(text); + } + } + + void append(String moreText) { + text.append(moreText); + fBuffer += moreText.length(); + } + } + + /** + * Updates the document. Will append everything that is available before + * finishing. + */ + private class QueueProcessingJob extends UIJob { + + QueueProcessingJob() { + super("IOConsole Updater"); //$NON-NLS-1$ + } + + /* + * (non-Javadoc) + * @see org.eclipse.core.internal.jobs.InternalJob#run(org.eclipse.core.runtime.IProgressMonitor) + */ + public IStatus runInUIThread(IProgressMonitor monitor) { + processQueue(); + return Status.OK_STATUS; + } + + /* + * Job will process as much as it can each time it's run, but it gets + * scheduled everytime a PendingPartition is added to the list, meaning + * that this job could get scheduled unnecessarily in cases of heavy output. + * Note however, that schedule() will only reschedule a running/scheduled Job + * once even if it's called many times. + */ + public boolean shouldRun() { + boolean shouldRun = connected && pendingPartitions != null && pendingPartitions.size() > 0; + return shouldRun; + } + } + + void processQueue() { + synchronized (overflowLock) { + ArrayList pendingCopy = new ArrayList(); + StringBuffer buffer = null; + boolean consoleClosed = false; + synchronized(pendingPartitions) { + pendingCopy.addAll(pendingPartitions); + pendingPartitions.clear(); + fBuffer = 0; + pendingPartitions.notifyAll(); + } + // determine buffer size + int size = 0; + for (Iterator i = pendingCopy.iterator(); i.hasNext(); ) { + PendingPartition pp = (PendingPartition) i.next(); + if (pp != consoleClosedPartition) { + size+= pp.text.length(); + } + } + buffer = new StringBuffer(size); + for (Iterator i = pendingCopy.iterator(); i.hasNext(); ) { + PendingPartition pp = (PendingPartition) i.next(); + if (pp != consoleClosedPartition) { + buffer.append(pp.text); + } else { + consoleClosed = true; + } + } + + if (connected) { + setUpdateInProgress(true); + updatePartitions = pendingCopy; + firstOffset = document.getLength(); + try { + if (buffer != null) { + document.replace(firstOffset, 0, buffer.toString()); + } + } catch (BadLocationException e) { + } + updatePartitions = null; + setUpdateInProgress(false); + } + if (consoleClosed) { + console.partitionerFinished(); + } + checkBufferSize(); + } + + } + + /** + * Job to trim the console document, runs in the UI thread. + */ + private class TrimJob extends WorkbenchJob { + + /** + * trims output up to the line containing the given offset, + * or all output if -1. + */ + private int truncateOffset; + + /** + * Creates a new job to trim the buffer. + */ + TrimJob() { + super("Trim Job"); //$NON-NLS-1$ + setSystem(true); + } + + /** + * Sets the trim offset. + * + * @param offset trims output up to the line containing the given offset + */ + public void setOffset(int offset) { + truncateOffset = offset; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) + */ + public IStatus runInUIThread(IProgressMonitor monitor) { + IJobManager jobManager = Job.getJobManager(); + try { + jobManager.join(console, monitor); + } catch (OperationCanceledException e1) { + return Status.CANCEL_STATUS; + } catch (InterruptedException e1) { + return Status.CANCEL_STATUS; + } + if (document == null) { + return Status.OK_STATUS; + } + + int length = document.getLength(); + if (truncateOffset < length) { + synchronized (overflowLock) { + try { + if (truncateOffset < 0) { + // clear + setUpdateInProgress(true); + document.set(""); //$NON-NLS-1$ + setUpdateInProgress(false); + partitions.clear(); + } else { + // overflow + int cutoffLine = document.getLineOfOffset(truncateOffset); + int cutOffset = document.getLineOffset(cutoffLine); + + + // set the new length of the first partition + ConsolePartition partition = (ConsolePartition) getPartition(cutOffset); + partition.setLength(partition.getOffset() + partition.getLength() - cutOffset); + + setUpdateInProgress(true); + document.replace(0, cutOffset, ""); //$NON-NLS-1$ + setUpdateInProgress(false); + + //remove partitions and reset Partition offsets + int index = partitions.indexOf(partition); + for (int i = 0; i < index; i++) { + partitions.remove(0); + } + + int offset = 0; + for (Iterator i = partitions.iterator(); i.hasNext(); ) { + ConsolePartition p = (ConsolePartition) i.next(); + p.setOffset(offset); + offset += p.getLength(); + } + } + } catch (BadLocationException e) { + } + } + } + return Status.OK_STATUS; + } + } + + /* (non-Javadoc) + * @see org.eclipse.ui.console.IConsoleDocumentPartitioner#isReadOnly(int) + */ + public boolean isReadOnly(int offset) { + return ((ConsolePartition)getPartition(offset)).isReadOnly(); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.console.IConsoleDocumentPartitioner#computeStyleRange(int, int) + */ + public StyleRange[] getStyleRanges(int offset, int length) { + if (!connected) { + return new StyleRange[0]; + } + ConsolePartition[] computedPartitions = (ConsolePartition[])computePartitioning(offset, length); + StyleRange[] styles = new StyleRange[computedPartitions.length]; + for (int i = 0; i < computedPartitions.length; i++) { + int rangeStart = Math.max(computedPartitions[i].getOffset(), offset); + int rangeLength = computedPartitions[i].getLength(); + styles[i] = computedPartitions[i].getStyleRange(rangeStart, rangeLength); + } + return styles; + } +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/EmptyPreferencePage.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/EmptyPreferencePage.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/EmptyPreferencePage.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,25 @@ +package org.jboss.tools.forge.preferences; + +import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; + +public class EmptyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { + + public EmptyPreferencePage() { + super(); + setDescription("Expand the tree to edit preferences for a specific feature."); + } + + protected Control createContents(Composite parent) { + noDefaultAndApplyButton(); + return new Composite(parent, SWT.NULL); + } + + public void init(IWorkbench workbench) { + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationDialog.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationDialog.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationDialog.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,168 @@ +package org.jboss.tools.forge.preferences; + + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.DirectoryDialog; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; + +public class ForgeInstallationDialog extends Dialog { + + String title; + Text nameText, locationText; + Button locationButton; + + String name, location; + + public ForgeInstallationDialog(Shell parentShell) { + super(parentShell); + } + + public void initialize(String t, String n, String l) { + this.title = t; + this.name = n; + this.location = l; + } + + protected Control createDialogArea(Composite parent) { + Composite area = (Composite)super.createDialogArea(parent); + getShell().setText(title); + GridLayout gridLayout = new GridLayout(); + gridLayout.numColumns = 3; + area.setLayout(gridLayout); + createMessageLabel(area); + createNameLabel(area); + createNameText(area); + createFillLabel(area); + createLocationLabel(area); + createLocationText(area); + createLocationButton(area); + createSeparator(area); + getShell().setText(title); + return area; + } + + protected Control createContents(Composite parent) { + Control result = super.createContents(parent); + updateOkButton(); + return result; + } + + private void createSeparator(Composite area) { + Label separator = new Label(area, SWT.SEPARATOR | SWT.HORIZONTAL); + GridData gridData = new GridData(GridData.FILL_HORIZONTAL); + gridData.horizontalSpan = 3; + gridData.verticalIndent = 15; + separator.setLayoutData(gridData); + } + + private void createLocationText(Composite area) { + locationText = new Text(area, SWT.BORDER); + GridData gridData = new GridData(GridData.FILL_HORIZONTAL); + gridData.widthHint = convertWidthInCharsToPixels(40); + locationText.setLayoutData(gridData); + locationText.setText(location == null ? "" : location); + locationText.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + location = locationText.getText(); + updateOkButton(); + } + }); + } + + private void createLocationButton(Composite area) { + locationButton = new Button(area, SWT.PUSH); + locationButton.setText("Search..."); + locationButton.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + searchLocation(); + } + }); + } + + private void searchLocation() { + DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.OPEN); + String result = dialog.open(); + if (result != null) { + locationText.setText(result); + } + } + + private void createLocationLabel(Composite area) { + Label label = new Label(area, SWT.NONE); + GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + label.setLayoutData(gridData); + label.setText("Location :"); + } + + private void createFillLabel(Composite area) { + new Label(area, SWT.NONE); + } + + private void createNameText(Composite area) { + nameText = new Text(area, SWT.BORDER); + GridData gridData = new GridData(); + gridData.widthHint = convertWidthInCharsToPixels(40); + nameText.setLayoutData(gridData); + nameText.setText(name == null ? "" : name); + nameText.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + name = nameText.getText(); + updateOkButton(); + } + }); + } + + private void updateOkButton() { + getButton(IDialogConstants.OK_ID).setEnabled(isValid()); + } + + private boolean isValid() { + if (name == null || location == null) { + return false; + } + if ("".equals(name) || "".equals(location)) { + return false; + } + return true; + } + + private void createNameLabel(Composite area) { + Label label = new Label(area, SWT.NONE); + GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + label.setLayoutData(gridData); + label.setText("Name :"); + } + + private void createMessageLabel(Composite area) { + Label label = new Label(area, SWT.NONE); + GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING); + gridData.horizontalSpan = 3; + gridData.verticalIndent = 10; + label.setLayoutData(gridData); + label.setText("Enter a name and choose the location : "); + } + + public String getName() { + return name; + } + + public String getLocation() { + return location; + } + + + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationLabelProvider.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationLabelProvider.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationLabelProvider.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,27 @@ +package org.jboss.tools.forge.preferences; + +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.forge.launching.ForgeInstallation; + +public class ForgeInstallationLabelProvider extends LabelProvider implements ITableLabelProvider { + + public String getColumnText(Object element, int columnIndex) { + if (element instanceof ForgeInstallation) { + ForgeInstallation forgeInstallation= (ForgeInstallation)element; + switch(columnIndex) { + case 0: + return forgeInstallation.getName(); + case 1: + return forgeInstallation.getLocation(); + } + } + return element.toString(); + } + + public Image getColumnImage(Object element, int columnIndex) { + return null; + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationsPreferencePage.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationsPreferencePage.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeInstallationsPreferencePage.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,288 @@ +package org.jboss.tools.forge.preferences; + + +import java.util.ArrayList; + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.CheckStateChangedEvent; +import org.eclipse.jface.viewers.CheckboxTableViewer; +import org.eclipse.jface.viewers.ICheckStateListener; +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.swt.SWT; +import org.eclipse.swt.custom.BusyIndicator; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.jboss.tools.forge.launching.ForgeInstallation; +import org.jboss.tools.forge.launching.ForgeRuntime; + +public class ForgeInstallationsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { + + private final int DEFAULT_COLUMN_WIDTH = 350/3 +1; + + private CheckboxTableViewer runtimesTableViewer ; + private Button removeButton; + private Button editButton; + private ArrayList<ForgeInstallation> installations = null; + private ForgeInstallation defaultInstallation = null; + + public ForgeInstallationsPreferencePage() { + super("Installed Forge Runtimes"); + } + + public void init(IWorkbench workbench) { + } + + protected Control createContents(Composite parent) { + noDefaultAndApplyButton(); + createLayout(parent); + createWrapLabel(parent); + createVerticalSpacer(parent); + createPageBody(parent); + initializeForgeInstallations(); + enableButtons(); + return parent; + } + + private void createPageBody(Composite parent) { + Composite pageBody = createPageBodyControl(parent); + createTitleLabel(pageBody); + createRuntimesArea(pageBody); + createButtonsArea(pageBody); + } + + private void createButtonsArea(Composite parent) { + Composite buttons = createButtonsComposite(parent); + createAddButton(buttons); + createEditButton(buttons); + createRemoveButton(buttons); + } + + private void createRemoveButton(Composite parent) { + removeButton = new Button(parent, SWT.PUSH); + removeButton.setText("&Remove"); + removeButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + removeButton.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event evt) { + ISelection selection = runtimesTableViewer.getSelection(); + if (selection != null && selection instanceof IStructuredSelection) { + Object object = ((IStructuredSelection)selection).getFirstElement(); + if (object != null && object instanceof ForgeInstallation) { + installations.remove(object); + refreshForgeInstallations(); + } + } + } + }); + } + + private void createAddButton(Composite parent) { + Button addButton = new Button(parent, SWT.PUSH); + addButton.setText("&Add..."); + addButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + addButton.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event evt) { + ForgeInstallationDialog dialog = new ForgeInstallationDialog(null); + dialog.initialize("Add Forge Runtime", "", ""); + if (dialog.open() != Dialog.CANCEL) { + installations.add(new ForgeInstallation(dialog.getName(), dialog.getLocation())); + refreshForgeInstallations(); + } + } + }); + } + + private void createEditButton(Composite parent) { + editButton = new Button(parent, SWT.PUSH); + editButton.setText("&Edit..."); + editButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + editButton.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event evt) { + ISelection selection = runtimesTableViewer.getSelection(); + if (selection != null && selection instanceof IStructuredSelection) { + Object object = ((IStructuredSelection)selection).getFirstElement(); + if (object != null && object instanceof ForgeInstallation) { + ForgeInstallation installation = (ForgeInstallation)object; + ForgeInstallationDialog dialog = new ForgeInstallationDialog(null); + dialog.initialize("Edit Forge Runtime", installation.getName(), installation.getLocation()); + if (dialog.open() != Dialog.CANCEL) { + installation.setName(dialog.getName()); + installation.setLocation(dialog.getLocation()); + refreshForgeInstallations(); + } + } + } + } + }); + } + + private Composite createButtonsComposite(Composite parent) { + Composite buttons = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.marginWidth = 0; + layout.marginHeight = 0; + buttons.setLayout(layout); + GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING); + gd.horizontalSpan = 1; + buttons.setLayoutData(gd); + return buttons; + } + + private void createTitleLabel(Composite parent) { + Label label = new Label(parent, SWT.NONE); + label.setText("Installed Forge Runtimes:"); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + gd.grabExcessHorizontalSpace = false; + label.setLayoutData(gd); + } + + private void createRuntimesArea(Composite parent) { + Table runtimesTable = createRuntimesTable(parent); + createNameColumn(runtimesTable); + createLocationColumn(runtimesTable); + createRuntimesTableViewer(runtimesTable); + } + + private void createRuntimesTableViewer(Table table) { + runtimesTableViewer = new CheckboxTableViewer(table); + runtimesTableViewer.setLabelProvider(new ForgeInstallationLabelProvider()); + runtimesTableViewer.setContentProvider(ArrayContentProvider.getInstance()); + runtimesTableViewer.addSelectionChangedListener(new ISelectionChangedListener() { + public void selectionChanged(SelectionChangedEvent evt) { + enableButtons(); + } + }); + runtimesTableViewer.addCheckStateListener(new ICheckStateListener() { + public void checkStateChanged(final CheckStateChangedEvent event) { + Object object = event.getElement(); + if (object != null && object instanceof ForgeInstallation) { + defaultInstallation = (ForgeInstallation)object; + refreshForgeInstallations(); + } + } + }); + } + + private void createLocationColumn(Table table) { + TableColumn column = new TableColumn(table, SWT.NULL); + column.setText("Location"); + column.setWidth(DEFAULT_COLUMN_WIDTH); + } + + private void createNameColumn(Table table) { + TableColumn column = new TableColumn(table, SWT.NULL); + column.setText("Name"); + column.setWidth(DEFAULT_COLUMN_WIDTH); + } + + private Table createRuntimesTable(Composite parent) { + Table runtimesTable= new Table(parent, SWT.CHECK | SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION); + GridData gd = new GridData(GridData.FILL_BOTH); + gd.heightHint = 250; + gd.widthHint = 350; + runtimesTable.setLayoutData(gd); + runtimesTable.setHeaderVisible(true); + runtimesTable.setLinesVisible(true); + return runtimesTable; + } + + private Composite createPageBodyControl(Composite ancestor) { + Composite result = new Composite(ancestor, SWT.NONE); + result.setLayout(new GridLayout(2, false)); + GridData gd = new GridData(GridData.FILL_BOTH); + result.setLayoutData(gd); + return result; + } + + private void createLayout(Composite ancestor) { + GridLayout layout= new GridLayout(); + layout.numColumns= 1; + layout.marginHeight = 0; + layout.marginWidth = 0; + ancestor.setLayout(layout); + } + + private Label createWrapLabel(Composite parent) { + Label l = new Label(parent, SWT.NONE | SWT.WRAP); + l.setFont(parent.getFont()); + l.setText("Add, remove or edit Forge runtimes. By default, the checked Forge runtime is used when launching Forge."); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.widthHint = 250; + l.setLayoutData(gd); + return l; + } + + private void createVerticalSpacer(Composite parent) { + Label lbl = new Label(parent, SWT.NONE); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = ((GridLayout)parent.getLayout()).numColumns; + lbl.setLayoutData(gd); + } + + private void initializeForgeInstallations() { + installations = new ArrayList<ForgeInstallation>(); + for (ForgeInstallation install : ForgeRuntime.getInstallations()) { + ForgeInstallation copy = new ForgeInstallation(install.getName(), install.getLocation()); + if (install == ForgeRuntime.getDefaultInstallation()) { + defaultInstallation = copy; + } + installations.add(copy); + } + refreshForgeInstallations(); + } + + private void refreshForgeInstallations() { + runtimesTableViewer.setInput((ForgeInstallation[])installations.toArray(new ForgeInstallation[installations.size()])); + runtimesTableViewer.setCheckedElements(new Object[] { defaultInstallation }); + runtimesTableViewer.refresh(); + } + + private void enableButtons() { + Object selectedObject = null; + IStructuredSelection selection = (IStructuredSelection) runtimesTableViewer.getSelection(); + if (selection != null) { + selectedObject = selection.getFirstElement(); + } + if (selectedObject == null +// || (selectedObject == runtimesTableViewer.getCheckedElements()[0]) + || (selectedObject instanceof ForgeInstallation + && ("embedded".equals(((ForgeInstallation)selectedObject).getName())))) { + removeButton.setEnabled(false); + editButton.setEnabled(false); + } else { + removeButton.setEnabled(selectedObject != runtimesTableViewer.getCheckedElements()[0]); + editButton.setEnabled(true); + } + } + + public boolean performOk() { + final boolean[] canceled = new boolean[] {false}; + BusyIndicator.showWhile(null, new Runnable() { + public void run() { + ForgeInstallation[] installations = (ForgeInstallation[])runtimesTableViewer.getInput(); + ForgeInstallation defaultInstallation = (ForgeInstallation)runtimesTableViewer.getCheckedElements()[0]; + ForgeRuntime.setInstallations(installations, defaultInstallation); + } + }); + if(canceled[0]) { + return false; + } + return super.performOk(); + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeIntallationLabelProvider.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeIntallationLabelProvider.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/preferences/ForgeIntallationLabelProvider.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,27 @@ +package org.jboss.tools.forge.preferences; + +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.forge.launching.ForgeInstallation; + +public class ForgeIntallationLabelProvider extends LabelProvider implements ITableLabelProvider { + + public String getColumnText(Object element, int columnIndex) { + if (element instanceof ForgeInstallation) { + ForgeInstallation forgeInstallation= (ForgeInstallation)element; + switch(columnIndex) { + case 0: + return forgeInstallation.getName(); + case 1: + return forgeInstallation.getLocation(); + } + } + return element.toString(); + } + + public Image getColumnImage(Object element, int columnIndex) { + return null; + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsolePage.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsolePage.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsolePage.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,36 @@ +package org.jboss.tools.forge.view; + +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.console.TextConsoleViewer; +import org.eclipse.ui.part.Page; +import org.jboss.tools.forge.console.Console; +import org.jboss.tools.forge.launching.ForgeRuntime; + +public class ConsolePage extends Page { + + private TextConsoleViewer viewer; + private Console console; + + @Override + public void createControl(Composite parent) { + console = new Console(ForgeRuntime.INSTANCE.getProcess()); + viewer = new ConsoleViewer(parent, console); + console.initialize(); + } + + @Override + public Control getControl() { + return viewer == null ? null : viewer.getControl(); + } + + @Override + public void setFocus() { + viewer.getControl().setFocus(); + } + + public Console getConsole() { + return console; + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleText.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleText.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleText.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,40 @@ +package org.jboss.tools.forge.view; + +import org.eclipse.swt.custom.ST; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.widgets.Composite; + +public class ConsoleText extends StyledText { + + public ConsoleText(Composite parent, int style) { + super(parent, style); + } + + public void invokeAction(int action) { + checkWidget(); + switch (action) { + case ST.LINE_UP: + doLineUp(); + break; + case ST.LINE_DOWN: + doLineDown(); + break; +// case ST.DELETE_PREVIOUS: +// doDeletePrevious(); +// break; + default: + super.invokeAction(action); + } + } + + private void doLineUp() { +// System.out.println("Line up"); + } + private void doLineDown() { +// System.out.println("Line down"); + } +// private void doDeletePrevious() { +// System.out.println("Backspace"); +// } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleView.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleView.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleView.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,125 @@ +package org.jboss.tools.forge.view; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.part.MessagePage; +import org.eclipse.ui.part.PageBook; +import org.eclipse.ui.part.PageSite; +import org.eclipse.ui.part.ViewPart; +import org.jboss.tools.forge.console.Console; +import org.jboss.tools.forge.launching.ForgeRuntime; + +public class ConsoleView extends ViewPart implements PropertyChangeListener { + + private static ConsoleView INSTANCE; + + private PageBook pageBook = null; + private Control notRunning; + private Control forgeIsStopping; + private Control waitWhileForgeIsStarting; + private Control forgeIsRunning; + private ConsolePage forgeIsRunningPage; + + public ConsoleView() { + if (INSTANCE == null) { + INSTANCE = this; + ForgeRuntime.INSTANCE.addPropertyChangeListener(this); + } + } + + @Override + public void createPartControl(Composite parent) { + pageBook = new PageBook(parent, SWT.NONE); + createForgeNotRunningPage(parent); + createWaitWhileForgeIsStartingPage(parent); + createForgeIsStoppingPage(parent); + showAppropriatePage(); + } + + private void createForgeNotRunningPage(Composite parent) { + MessagePage page = new MessagePage(); + page.createControl(pageBook); + page.init(new PageSite(getViewSite())); + page.setMessage("Forge is not running."); + notRunning = page.getControl(); + } + + private void createWaitWhileForgeIsStartingPage(Composite parent) { + MessagePage page = new MessagePage(); + page.createControl(pageBook); + page.init(new PageSite(getViewSite())); + page.setMessage("Please wait while Forge is starting"); + waitWhileForgeIsStarting = page.getControl(); + } + + private void createForgeIsStoppingPage(Composite parent) { + MessagePage page = new MessagePage(); + page.createControl(pageBook); + page.init(new PageSite(getViewSite())); + page.setMessage("Please wait while Forge is stopping"); + forgeIsStopping = page.getControl(); + } + + @Override + public void setFocus() { + if (ForgeRuntime.STATE_RUNNING.equals(ForgeRuntime.INSTANCE.getRuntimeState())) { + forgeIsRunningPage.setFocus(); + } + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + showAppropriatePage(); + } + }); + } + + private void showAppropriatePage() { + String runtimeState = ForgeRuntime.INSTANCE.getRuntimeState(); + if (ForgeRuntime.STATE_NOT_RUNNING.equals(runtimeState)) { + pageBook.showPage(notRunning); + } else if (ForgeRuntime.STATE_RUNNING.equals(runtimeState)) { + showForgeIsRunning(); + } else if (ForgeRuntime.STATE_STARTING.equals(runtimeState)) { + pageBook.showPage(waitWhileForgeIsStarting); + } else if (ForgeRuntime.STATE_STOPPING.equals(runtimeState)) { + pageBook.showPage(forgeIsStopping); + } + } + + private void showForgeIsRunning() { + Control oldForgeIsRunning = forgeIsRunning; + ConsolePage oldForgeIsRunningPage = forgeIsRunningPage; + forgeIsRunningPage = new ConsolePage(); + forgeIsRunningPage.createControl(pageBook); + forgeIsRunningPage.init(new PageSite(getViewSite())); + forgeIsRunning = forgeIsRunningPage.getControl(); + pageBook.showPage(forgeIsRunning); + if (oldForgeIsRunningPage != null) { + Console oldConsole = oldForgeIsRunningPage.getConsole(); + if (oldConsole != null) { + DebugPlugin.getDefault().removeDebugEventListener(oldConsole); + oldConsole.dispose(); + } + oldForgeIsRunningPage.dispose(); + } + if (oldForgeIsRunning != null) { + oldForgeIsRunning.dispose(); + } + } + + public void dispose() { + ForgeRuntime.INSTANCE.removePropertyChangeListener(this); + super.dispose(); + } + +} Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleViewer.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleViewer.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/view/ConsoleViewer.java 2011-06-08 10:07:42 UTC (rev 31904) @@ -0,0 +1,86 @@ +package org.jboss.tools.forge.view; + +import org.eclipse.jface.text.DocumentEvent; +import org.eclipse.jface.text.IDocumentListener; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.KeyListener; +import org.eclipse.swt.events.VerifyEvent; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.console.TextConsoleViewer; +import org.jboss.tools.forge.console.Console; + +public class ConsoleViewer extends TextConsoleViewer { + + private static String BACKSPACE = new Character('\b').toString(); + private static String UP_ARROW = new Character((char)16).toString(); + private static String DOWN_ARROW = new Character((char)14).toString(); + + private Console console = null; + + public ConsoleViewer(Composite parent, Console console) { + super(parent, console); + this.console = console; + getDocument().addDocumentListener(new DocumentListener()); + } + + protected void handleVerifyEvent(VerifyEvent e) { + console.getInputStream().appendData(e.text); + e.doit = false; + } + + private void handleBackspace() { + console.getInputStream().appendData(BACKSPACE); + } + + private void handleArrowUp() { + console.getInputStream().appendData(UP_ARROW); + } + + private void handleArrowDown() { + console.getInputStream().appendData(DOWN_ARROW); + } + + protected StyledText createTextWidget(Composite parent, int styles) { + ConsoleText styledText= new ConsoleText(parent, styles | SWT.WRAP); + styledText.setLeftMargin(Math.max(styledText.getLeftMargin(), 2)); + styledText.addKeyListener(new ConsoleKeyListener()); + return styledText; + } + + private class DocumentListener implements IDocumentListener { + + public void documentAboutToBeChanged(DocumentEvent event) { + } + + + public void documentChanged(DocumentEvent event) { + revealEndOfDocument(); + Control control = getControl(); + if (control instanceof StyledText) { + StyledText text = (StyledText)control; + text.setCaretOffset(text.getCharCount()); + } + } + } + + private class ConsoleKeyListener implements KeyListener { + + public void keyPressed(KeyEvent e) { + } + + public void keyReleased(KeyEvent e) { + if (e.keyCode == SWT.BS) { + handleBackspace(); + } else if (e.keyCode == SWT.ARROW_UP) { + handleArrowUp(); + } else if (e.keyCode == SWT.ARROW_DOWN) { + handleArrowDown(); + } + } + + } + +}

14 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r31903 - trunk/forge/plugins.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-06-08 05:58:05 -0400 (Wed, 08 Jun 2011) New Revision: 31903 Added: trunk/forge/plugins/org.jboss.tools.forge.ui/ Log: remove seam reference of plugin name

14 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2011