Author: heiko.braun(a)jboss.com Date: 2007-11-21 07:01:29 -0500 (Wed, 21 Nov 2007) New Revision: 5094 Modified: rest/jboss-rest.iws rest/src/main/java/org/jboss/rs/deployment/ModelDeploymentAspect.java rest/src/main/java/org/jboss/rs/deployment/ResourceServlet.java rest/src/main/java/org/jboss/rs/media/ContentNegotiation.java rest/src/main/java/org/jboss/rs/media/DefaultContentNegotiation.java rest/src/main/java/org/jboss/rs/media/DefaultProviderFactory.java rest/src/main/java/org/jboss/rs/media/xml/JAXBProvider.java rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java rest/src/main/java/org/jboss/rs/model/AbstractResourceOperation.java rest/src/main/java/org/jboss/rs/model/OperationBinding.java rest/src/main/java/org/jboss/rs/model/ParameterBinding.java rest/src/main/java/org/jboss/rs/model/dd/DeploymentDescriptorParser.java rest/src/main/java/org/jboss/rs/model/dd/JbossrsType.java rest/src/main/java/org/jboss/rs/runtime/ContextAdapterBuilder.java rest/src/main/java/org/jboss/rs/runtime/Invocation.java rest/src/main/java/org/jboss/rs/runtime/InvocationMediator.java rest/src/main/java/org/jboss/rs/runtime/RuntimeContext.java rest/src/main/java/org/jboss/rs/util/Convert.java rest/src/test/java/org/jboss/test/rs/Widget.java rest/src/test/java/org/jboss/test/rs/WidgetList.java rest/src/test/java/org/jboss/test/rs/deployment/DeploymentTestCase.java rest/src/test/java/org/jboss/test/rs/invocation/InvocationBuilderTestCase.java rest/src/test/java/org/jboss/test/rs/media/BookResource.java rest/src/test/java/org/jboss/test/rs/media/BookStoreResource.java rest/src/test/java/org/jboss/test/rs/model/ModelParserTestCase.java rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java rest/src/test/java/org/jboss/test/rs/model/RunRegex.java rest/src/test/java/org/jboss/test/rs/runtime/RuntimeContextTestCase.java rest/version.properties.md5 Log: Optimize imports Modified: rest/jboss-rest.iws =================================================================== --- rest/jboss-rest.iws 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/jboss-rest.iws 2007-11-21 12:01:29 UTC (rev 5094) @@ -131,69 +131,17 @@ <component name="FavoritesProjectViewPane" /> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="build-deploy.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/ant-import/build-deploy.xml"> + <file leaf-file-name="ModelDeploymentAspect.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rs/deployment/ModelDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="2" selection-start="775" selection-end="775" vertical-scroll-proportion="0.3"> - <folding /> + <state line="31" column="50" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.38348624"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="build-testsuite.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/ant-import-tests/build-testsuite.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="56" selection-start="2237" selection-end="2252" vertical-scroll-proportion="0.33211008"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="build-testsuite.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/test-framework/ant-import/build-testsuite.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="126" column="57" selection-start="5771" selection-end="5771" vertical-scroll-proportion="0.4754717"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="macros-deploy-rs.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/ant-import/macros-deploy-rs.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="428" column="52" selection-start="18146" selection-end="18146" vertical-scroll-proportion="0.5471698"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="build-thirdparty.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/ant-import/build-thirdparty.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="90" column="75" selection-start="6631" selection-end="6631" vertical-scroll-proportion="0.83773583"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="version.properties" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/version.properties"> - <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="15" selection-start="913" selection-end="913" vertical-scroll-proportion="0.7816514"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ResourceServlet.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rs/deployment/ResourceServlet.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="60" column="60" selection-start="2401" selection-end="2401" vertical-scroll-proportion="0.59266055"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -322,10 +270,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test-framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -345,13 +289,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test-framework" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test-framework/ant-import" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -371,39 +311,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rs" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/test/java/org/jboss/test/rs" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -422,40 +340,20 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/ant-import-tests" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-rest" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rs" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/ant-import" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/main/java/org/jboss/rs/deployment" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -774,48 +672,57 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/ant-import/build-thirdparty.xml"> + <entry file="file://$PROJECT_DIR$/ant-import-tests/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="90" column="75" selection-start="6631" selection-end="6631" vertical-scroll-proportion="0.83773583"> + <state line="50" column="56" selection-start="2237" selection-end="2252" vertical-scroll-proportion="0.33211008"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rs/deployment/ResourceServlet.java"> + <entry file="file://$PROJECT_DIR$/src/test-framework/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="60" column="60" selection-start="2401" selection-end="2401" vertical-scroll-proportion="0.59266055"> + <state line="126" column="57" selection-start="5768" selection-end="5768" vertical-scroll-proportion="0.4754717"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/version.properties"> + <entry file="file://$PROJECT_DIR$/ant-import/macros-deploy-rs.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="15" selection-start="913" selection-end="913" vertical-scroll-proportion="0.7816514"> + <state line="428" column="18" selection-start="18143" selection-end="18143" vertical-scroll-proportion="0.5471698"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/ant-import-tests/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/ant-import/build-thirdparty.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="56" selection-start="2237" selection-end="2252" vertical-scroll-proportion="0.33211008"> + <state line="90" column="68" selection-start="6631" selection-end="6631" vertical-scroll-proportion="0.83773583"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/ant-import/macros-deploy-rs.xml"> + <entry file="file://$PROJECT_DIR$/version.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="428" column="52" selection-start="18146" selection-end="18146" vertical-scroll-proportion="0.5471698"> + <state line="35" column="15" selection-start="905" selection-end="905" vertical-scroll-proportion="0.7816514"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test-framework/ant-import/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rs/deployment/ResourceServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="126" column="57" selection-start="5771" selection-end="5771" vertical-scroll-proportion="0.4754717"> + <state line="60" column="60" selection-start="2401" selection-end="2401" vertical-scroll-proportion="0.59266055"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/org/jboss/rs/deployment/ModelDeploymentAspect.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="31" column="50" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.38348624"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> </project> Modified: rest/src/main/java/org/jboss/rs/deployment/ModelDeploymentAspect.java =================================================================== --- rest/src/main/java/org/jboss/rs/deployment/ModelDeploymentAspect.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/deployment/ModelDeploymentAspect.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,18 +21,15 @@ */ package org.jboss.rs.deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.rs.model.ResourceModelParser; -import org.jboss.rs.model.ResourceModel; import org.jboss.rs.ResourceRegistry; import org.jboss.rs.ResourceRegistryFactory; +import org.jboss.rs.model.ResourceModel; +import org.jboss.rs.model.ResourceModelParser; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Service; -import java.util.List; -import java.util.ArrayList; - /** * @author Heiko.Braun(a)jboss.com * @version $Revision$ Modified: rest/src/main/java/org/jboss/rs/deployment/ResourceServlet.java =================================================================== --- rest/src/main/java/org/jboss/rs/deployment/ResourceServlet.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/deployment/ResourceServlet.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,6 +21,7 @@ */ package org.jboss.rs.deployment; +import org.jboss.logging.Logger; import org.jboss.rs.MethodHTTP; import org.jboss.rs.ResourceError; import org.jboss.rs.ResourceRegistry; @@ -29,19 +30,18 @@ import org.jboss.rs.model.ResourceModel; import org.jboss.rs.runtime.InvocationMediator; import org.jboss.rs.runtime.RuntimeContext; -import org.jboss.logging.Logger; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.ProviderFactory; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.core.Response; import java.io.IOException; +import java.io.OutputStream; import java.io.PrintWriter; -import java.io.OutputStream; import java.net.URI; import java.util.ArrayList; import java.util.List; Modified: rest/src/main/java/org/jboss/rs/media/ContentNegotiation.java =================================================================== --- rest/src/main/java/org/jboss/rs/media/ContentNegotiation.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/media/ContentNegotiation.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,9 +21,9 @@ */ package org.jboss.rs.media; +import org.jboss.rs.model.NoMethodException; +import org.jboss.rs.model.ResourceMatch; import org.jboss.rs.model.ResourceMethod; -import org.jboss.rs.model.ResourceMatch; -import org.jboss.rs.model.NoMethodException; import org.jboss.rs.runtime.RuntimeContext; import java.util.List; Modified: rest/src/main/java/org/jboss/rs/media/DefaultContentNegotiation.java =================================================================== --- rest/src/main/java/org/jboss/rs/media/DefaultContentNegotiation.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/media/DefaultContentNegotiation.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,16 +21,16 @@ */ package org.jboss.rs.media; +import org.jboss.logging.Logger; +import org.jboss.rs.MethodHTTP; +import org.jboss.rs.model.NoMethodException; +import org.jboss.rs.model.ResourceMatch; import org.jboss.rs.model.ResourceMethod; -import org.jboss.rs.model.ResourceMatch; -import org.jboss.rs.model.NoMethodException; import org.jboss.rs.runtime.RuntimeContext; -import org.jboss.rs.MethodHTTP; -import org.jboss.logging.Logger; import javax.activation.MimeType; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; /** * Matches resource methods in the following order: Modified: rest/src/main/java/org/jboss/rs/media/DefaultProviderFactory.java =================================================================== --- rest/src/main/java/org/jboss/rs/media/DefaultProviderFactory.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/media/DefaultProviderFactory.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -1,15 +1,15 @@ package org.jboss.rs.media; +import org.jboss.rs.media.simple.StringProvider; import org.jboss.rs.media.xml.JAXBProvider; -import org.jboss.rs.media.simple.StringProvider; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.HeaderProvider; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.ProviderFactory; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; /** Modified: rest/src/main/java/org/jboss/rs/media/xml/JAXBProvider.java =================================================================== --- rest/src/main/java/org/jboss/rs/media/xml/JAXBProvider.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/media/xml/JAXBProvider.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -5,8 +5,8 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; -import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlRootElement; import java.io.IOException; import java.io.InputStream; Modified: rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java =================================================================== --- rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -22,8 +22,8 @@ package org.jboss.rs.model; import java.util.StringTokenizer; +import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.regex.Matcher; /** * @author Heiko.Braun(a)jboss.com Modified: rest/src/main/java/org/jboss/rs/model/AbstractResourceOperation.java =================================================================== --- rest/src/main/java/org/jboss/rs/model/AbstractResourceOperation.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/model/AbstractResourceOperation.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -1,8 +1,8 @@ package org.jboss.rs.model; +import java.lang.reflect.Method; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; -import java.lang.reflect.Method; /** * Common base class for {@link org.jboss.rs.model.ResourceLocator} Modified: rest/src/main/java/org/jboss/rs/model/OperationBinding.java =================================================================== --- rest/src/main/java/org/jboss/rs/model/OperationBinding.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/model/OperationBinding.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,8 +21,8 @@ */ package org.jboss.rs.model; +import org.jboss.rs.runtime.Invocation; import org.jboss.rs.runtime.InvocationModel; -import org.jboss.rs.runtime.Invocation; import java.lang.reflect.Method; Modified: rest/src/main/java/org/jboss/rs/model/ParameterBinding.java =================================================================== --- rest/src/main/java/org/jboss/rs/model/ParameterBinding.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/model/ParameterBinding.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,11 +21,11 @@ */ package org.jboss.rs.model; +import org.jboss.rs.MethodHTTP; +import org.jboss.rs.runtime.ContextAdapterBuilder; import org.jboss.rs.runtime.Invocation; import org.jboss.rs.runtime.InvocationModel; import org.jboss.rs.runtime.RuntimeContext; -import org.jboss.rs.runtime.ContextAdapterBuilder; -import org.jboss.rs.MethodHTTP; import javax.ws.rs.HeaderParam; import javax.ws.rs.UriParam; Modified: rest/src/main/java/org/jboss/rs/model/dd/DeploymentDescriptorParser.java =================================================================== --- rest/src/main/java/org/jboss/rs/model/dd/DeploymentDescriptorParser.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/model/dd/DeploymentDescriptorParser.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -23,14 +23,10 @@ import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.Marshaller; +import javax.xml.bind.*; import javax.xml.namespace.QName; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; /** Modified: rest/src/main/java/org/jboss/rs/model/dd/JbossrsType.java =================================================================== --- rest/src/main/java/org/jboss/rs/model/dd/JbossrsType.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/model/dd/JbossrsType.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -8,12 +8,12 @@ package org.jboss.rs.model.dd; -import java.util.ArrayList; -import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import java.util.ArrayList; +import java.util.List; /** Modified: rest/src/main/java/org/jboss/rs/runtime/ContextAdapterBuilder.java =================================================================== --- rest/src/main/java/org/jboss/rs/runtime/ContextAdapterBuilder.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/runtime/ContextAdapterBuilder.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,15 +21,9 @@ */ package org.jboss.rs.runtime; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Cookie; -import java.util.List; +import javax.ws.rs.core.*; import java.net.URI; +import java.util.List; /** * Adopts 311 runtime interfaces to an internal runtime context.<br> Modified: rest/src/main/java/org/jboss/rs/runtime/Invocation.java =================================================================== --- rest/src/main/java/org/jboss/rs/runtime/Invocation.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/runtime/Invocation.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,9 +21,9 @@ */ package org.jboss.rs.runtime; +import java.lang.reflect.Method; +import java.util.LinkedList; import java.util.List; -import java.util.LinkedList; -import java.lang.reflect.Method; /** * The visitor part of the pattern. Modified: rest/src/main/java/org/jboss/rs/runtime/InvocationMediator.java =================================================================== --- rest/src/main/java/org/jboss/rs/runtime/InvocationMediator.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/runtime/InvocationMediator.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -1,9 +1,9 @@ package org.jboss.rs.runtime; +import org.jboss.rs.ResourceError; import org.jboss.rs.model.ResourceLocator; +import org.jboss.rs.model.ResourceMethod; import org.jboss.rs.model.StatefulResourceResolver; -import org.jboss.rs.model.ResourceMethod; -import org.jboss.rs.ResourceError; import java.util.Stack; Modified: rest/src/main/java/org/jboss/rs/runtime/RuntimeContext.java =================================================================== --- rest/src/main/java/org/jboss/rs/runtime/RuntimeContext.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/runtime/RuntimeContext.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -28,10 +28,8 @@ import javax.activation.MimeType; import javax.activation.MimeTypeParseException; import java.net.URI; -import java.net.URL; import java.util.ArrayList; import java.util.List; -import java.util.Stack; /** * Requesting a resource thorugh HTTP creates a runtime context<br> Modified: rest/src/main/java/org/jboss/rs/util/Convert.java =================================================================== --- rest/src/main/java/org/jboss/rs/util/Convert.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/main/java/org/jboss/rs/util/Convert.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -23,15 +23,14 @@ import org.jboss.rs.MethodHTTP; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.ConsumeMime; -import javax.ws.rs.ProduceMime; import javax.activation.MimeType; import javax.activation.MimeTypeParseException; -import java.lang.annotation.Annotation; +import javax.ws.rs.ConsumeMime; +import javax.ws.rs.HttpMethod; +import javax.ws.rs.ProduceMime; import java.lang.reflect.Method; -import java.util.List; import java.util.ArrayList; +import java.util.List; import java.util.StringTokenizer; /** Modified: rest/src/test/java/org/jboss/test/rs/Widget.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/Widget.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/Widget.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -22,11 +22,11 @@ package org.jboss.test.rs; import javax.ws.rs.HttpMethod; +import javax.ws.rs.ProduceMime; import javax.ws.rs.UriParam; import javax.ws.rs.UriTemplate; -import javax.ws.rs.ProduceMime; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; /** * @author Heiko.Braun(a)jboss.com Modified: rest/src/test/java/org/jboss/test/rs/WidgetList.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/WidgetList.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/WidgetList.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,11 +21,7 @@ */ package org.jboss.test.rs; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.UriParam; -import javax.ws.rs.UriTemplate; -import javax.ws.rs.ConsumeMime; -import javax.ws.rs.ProduceMime; +import javax.ws.rs.*; import javax.ws.rs.core.HttpContext; import javax.ws.rs.core.HttpHeaders; Modified: rest/src/test/java/org/jboss/test/rs/deployment/DeploymentTestCase.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/deployment/DeploymentTestCase.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/deployment/DeploymentTestCase.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,16 +21,15 @@ */ package org.jboss.test.rs.deployment; +import junit.framework.Test; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import junit.framework.Test; -import java.net.URL; -import java.net.URLConnection; -import java.net.HttpURLConnection; -import java.io.OutputStreamWriter; import java.io.BufferedReader; import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.HttpURLConnection; +import java.net.URL; /** * @author Heiko.Braun(a)jboss.com Modified: rest/src/test/java/org/jboss/test/rs/invocation/InvocationBuilderTestCase.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/invocation/InvocationBuilderTestCase.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/invocation/InvocationBuilderTestCase.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -22,16 +22,16 @@ package org.jboss.test.rs.invocation; import junit.framework.TestCase; +import org.jboss.rs.MethodHTTP; import org.jboss.rs.ResourceRegistry; -import org.jboss.rs.MethodHTTP; +import org.jboss.rs.model.*; import org.jboss.rs.runtime.*; -import org.jboss.rs.model.*; import org.jboss.test.rs.WidgetList; import javax.ws.rs.core.HttpHeaders; +import java.net.URI; import java.util.List; import java.util.Stack; -import java.net.URI; /** * @author Heiko.Braun(a)jboss.com Modified: rest/src/test/java/org/jboss/test/rs/media/BookResource.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/media/BookResource.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/media/BookResource.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -1,9 +1,9 @@ package org.jboss.test.rs.media; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlElement; import javax.ws.rs.HttpMethod; import javax.ws.rs.UriTemplate; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "book") public class BookResource Modified: rest/src/test/java/org/jboss/test/rs/media/BookStoreResource.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/media/BookStoreResource.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/media/BookStoreResource.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -1,11 +1,11 @@ package org.jboss.test.rs.media; -import javax.ws.rs.UriTemplate; import javax.ws.rs.HttpMethod; +import javax.ws.rs.ProduceMime; import javax.ws.rs.UriParam; -import javax.ws.rs.ProduceMime; +import javax.ws.rs.UriTemplate; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; @UriTemplate("books") public class BookStoreResource Modified: rest/src/test/java/org/jboss/test/rs/model/ModelParserTestCase.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/model/ModelParserTestCase.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/model/ModelParserTestCase.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -22,10 +22,10 @@ package org.jboss.test.rs.model; import junit.framework.TestCase; +import org.jboss.rs.MethodHTTP; +import org.jboss.rs.model.ResourceMethod; +import org.jboss.rs.model.ResourceModel; import org.jboss.rs.model.ResourceModelParser; -import org.jboss.rs.model.ResourceModel; -import org.jboss.rs.model.ResourceMethod; -import org.jboss.rs.MethodHTTP; import org.jboss.test.rs.WidgetList; /** Modified: rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -22,18 +22,18 @@ package org.jboss.test.rs.model; import junit.framework.TestCase; +import org.jboss.rs.MethodHTTP; import org.jboss.rs.ResourceRegistry; -import org.jboss.rs.MethodHTTP; -import org.jboss.rs.runtime.RuntimeContext; +import org.jboss.rs.model.ResourceMethod; import org.jboss.rs.model.ResourceModel; import org.jboss.rs.model.ResourceModelParser; import org.jboss.rs.model.StatefulResourceResolver; -import org.jboss.rs.model.ResourceMethod; +import org.jboss.rs.runtime.RuntimeContext; import org.jboss.test.rs.WidgetList; -import java.util.List; import java.lang.reflect.Method; import java.net.URI; +import java.util.List; /** * @author Heiko.Braun(a)jboss.com Modified: rest/src/test/java/org/jboss/test/rs/model/RunRegex.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/model/RunRegex.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/model/RunRegex.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -21,9 +21,9 @@ */ package org.jboss.test.rs.model; +import java.net.URI; +import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.regex.Matcher; -import java.net.URI; /** * @author Heiko.Braun(a)jboss.com Modified: rest/src/test/java/org/jboss/test/rs/runtime/RuntimeContextTestCase.java =================================================================== --- rest/src/test/java/org/jboss/test/rs/runtime/RuntimeContextTestCase.java 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/src/test/java/org/jboss/test/rs/runtime/RuntimeContextTestCase.java 2007-11-21 12:01:29 UTC (rev 5094) @@ -1,9 +1,9 @@ package org.jboss.test.rs.runtime; import junit.framework.TestCase; -import org.jboss.rs.runtime.RuntimeContext; import org.jboss.rs.MethodHTTP; import org.jboss.rs.model.ResourceModel; +import org.jboss.rs.runtime.RuntimeContext; import java.net.URI; import java.util.ArrayList; Modified: rest/version.properties.md5 =================================================================== --- rest/version.properties.md5 2007-11-21 11:57:05 UTC (rev 5093) +++ rest/version.properties.md5 2007-11-21 12:01:29 UTC (rev 5094) @@ -1 +1 @@ -8526df8f198ffe8c905ea1e9c1d5da0e +9040a6b26e3d736e1c41bc57a0f219d8