<version>${jettyVersion}</version>
<scope>runtime</scope>
</dependency>
- <!--
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-</artifactId>
+ <artifactId>jetty-start</artifactId>
<version>${jettyVersion}</version>
<scope>runtime</scope>
</dependency>
- -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-deploy</artifactId>
+ <version>${jettyVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jsp-2.1</artifactId>
+ <version>${jettyVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ -->
+
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-glassfish</artifactId>
+ <version>9.1.1.B60.25.p0</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1-glassfish</artifactId>
+ <version>9.1.1.B60.25.p0</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.7</version>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<daemons>
<daemon>
<id>archiva</id>
- <mainClass>org.mortbay.start.Main</mainClass>
+ <mainClass>org.eclipse.jetty.start.Main</mainClass>
<commandLineArguments>
<commandLineArgument>conf/jetty.xml</commandLineArgument>
</commandLineArguments>
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
<!-- =============================================================== -->
-<Configure id="Server" class="org.mortbay.jetty.Server">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Server Thread Pool -->
<Set name="ThreadPool">
<!-- Default bounded blocking threadpool
-->
- <New class="org.mortbay.thread.BoundedThreadPool">
+ <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
<Set name="minThreads">10</Set>
<Set name="maxThreads">250</Set>
- <Set name="lowThreads">25</Set>
</New>
<!-- Optional Java 5 bounded threadpool with job queue
- <New class="org.mortbay.thread.concurrent.ThreadPool">
+ <New class="org.eclipse.jetty.util.thread.ExecutorThreadPool">
<Set name="corePoolSize">250</Set>
<Set name="maximumPoolSize">250</Set>
</New>
-->
<Call name="addConnector">
<Arg>
- <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
<Set name="host"><SystemProperty name="jetty.host"/></Set>
<Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set>
<Set name="maxIdleTime">30000</Set>
<!-- Set handler Collection Structure -->
<!-- =========================================================== -->
<Set name="handler">
- <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+ <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
<Set name="handlers">
- <Array type="org.mortbay.jetty.Handler">
+ <Array type="org.eclipse.jetty.server.Handler">
<Item>
- <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+ <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
</Item>
<Item>
- <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+ <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
</Item>
<Item>
- <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+ <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
</Item>
</Array>
</Set>
<!-- =========================================================== -->
<Call name="addLifeCycle">
<Arg>
- <New class="org.mortbay.jetty.deployer.ContextDeployer">
+ <New class="org.eclipse.jetty.deploy.ContextDeployer">
<Set name="contexts"><Ref id="Contexts"/></Set>
<Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
<Set name="scanInterval">1</Set>
<!-- =========================================================== -->
<Call name="addLifeCycle">
<Arg>
- <New class="org.mortbay.jetty.deployer.WebAppDeployer">
+ <New class="org.eclipse.jetty.deploy.WebAppDeployer">
<Set name="contexts"><Ref id="Contexts"/></Set>
<Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/apps</Set>
<Set name="parentLoaderPriority">false</Set>
<!-- =========================================================== -->
<Ref id="RequestLog">
<Set name="requestLog">
- <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
+ <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
<Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set>
<Set name="filenameDateFormat">yyyy_MM_dd</Set>
<Set name="retainDays">90</Set>
<!-- javax.transaction.UserTransaction. -->
+ <Call name="setAttribute">
+ <Arg>org.eclipse.jetty.webapp.configuration</Arg>
+ <Arg>
+ <Array type="java.lang.String">
+ <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
+ <Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
+ <Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
+ <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
+ <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
+ <Item>org.eclipse.jetty.plus.webapp.PlusConfiguration</Item>
+ <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
+ <Item>org.eclipse.jetty.webapp.TagLibConfiguration</Item>
+ </Array>
+ </Arg>
+ </Call>
+
<!-- =========================================================== -->
<!-- Configurations for WebAppContexts -->
<!-- Sequence of configurations to be applied to a webapp. -->
<!-- =========================================================== -->
<Array id="plusConfig" type="java.lang.String">
- <Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item>
- <Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item>
- <Item>org.mortbay.jetty.plus.webapp.Configuration</Item>
- <Item>org.mortbay.jetty.webapp.JettyWebXmlConfiguration</Item>
+ <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
+ <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
+ <Item>org.eclipse.jetty.webapp.Configuration</Item>
+ <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
<Item>org.mortbay.jetty.webapp.TagLibConfiguration</Item>
</Array>
- <!-- =========================================================== -->
- <!-- Deploy all webapps in webapps-plus -->
- <!-- =========================================================== -->
- <Call class="org.mortbay.jetty.webapp.WebAppContext" name="addWebApplications">
- <Arg><Ref id="Contexts"/></Arg>
- <Arg>./apps</Arg>
- <Arg>org/mortbay/jetty/webapp/webdefault.xml</Arg>
- <Arg><Ref id="plusConfig"/></Arg>
- <Arg type="boolean">True</Arg>
- <Arg type="boolean">False</Arg>
- </Call>
-
<!-- ARCHIVA CONFIG -->
- <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+ <New id="validation_mail" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>mail/Session</Arg>
<Arg>
- <New class="org.mortbay.naming.factories.MailSessionReference">
+ <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
<Set name="user"></Set>
<Set name="password"></Set>
<Set name="properties">
<!-- Users / Security Database -->
- <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
+ <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>jdbc/users</Arg>
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
</Arg>
</New>
- <New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource">
+ <New id="usersShutdown" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>jdbc/usersShutdown</Arg>
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
-
- <tlib-version>2.2.3</tlib-version>
- <jsp-version>1.2</jsp-version>
- <short-name>archiva</short-name>
-
- <uri>/WEB-INF/taglib.tld</uri>
-
- <display-name>Archiva Taglib</display-name>
- <description><![CDATA[Archiva JSP Taglib]]></description>
-
- <tag>
-
- <name>groupIdLink</name>
- <tag-class>org.apache.archiva.web.tags.GroupIdLinkTag</tag-class>
- <body-content>empty</body-content>
- <description><![CDATA[Render a groupId as a set of Links]]></description>
-
- <attribute>
- <name>var</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[The GroupID String]]></description>
- </attribute>
-
- <attribute>
- <name>includeTop</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[Boolean indicating if 'top' link should be created or not.]]></description>
- </attribute>
-
- </tag>
-
- <tag>
-
- <name>copy-paste-snippet</name>
- <tag-class>org.apache.archiva.web.tags.CopyPasteSnippetTag</tag-class>
- <body-content>empty</body-content>
- <description><![CDATA[Render a copy paste snippet for the provided object]]></description>
-
- <attribute>
- <name>object</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[The Object to Render]]></description>
- </attribute>
-
- <attribute>
- <name>wrapper</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[The wrapper type to use, can be 'pre' or 'toggle']]></description>
- </attribute>
- </tag>
-
- <tag>
-
- <name>dependency-tree</name>
- <tag-class>org.apache.archiva.web.tags.DependencyTreeTag</tag-class>
- <body-content>JSP</body-content>
- <description><![CDATA[Render a dependency tree for the provided project.]]></description>
-
- <attribute>
- <name>groupId</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[The groupId]]></description>
- </attribute>
-
- <attribute>
- <name>artifactId</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[The artifactId]]></description>
- </attribute>
-
- <attribute>
- <name>version</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[The version]]></description>
- </attribute>
-
- <attribute>
- <name>modelVersion</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[The version of the project model. Used to verify the dependency graph for generic snapshots not yet in the repo.]]></description>
- </attribute>
-
- <attribute>
- <name>nodevar</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
-
- <description><![CDATA[The variable name for the node.]]></description>
- </attribute>
-
- </tag>
-
-</taglib>
projects / archiva.git / commitdiff