Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup of jndi setup. update the version number to 7.0.2. fix some dependencies 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1284 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Hugues Malphettes 2010-02-23 20:52:46 +00:00
parent 3b6870c4ec
commit f03dce5432
15 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Jetty-OSGi-Jasper integration
Fragment-Host: org.eclipse.jetty.osgi.boot
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jsp;singleton:=true
Bundle-Version: 7.0.1.qualifier
Bundle-Version: 7.0.2.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.mortbay.jetty.jsp-2.1-glassfish,

2
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View File

@ -49,7 +49,7 @@
<configuration>
<tasks>
<replace file="target/classes/META-INF/MANIFEST.MF"
token="Bundle-Version: 7.0.1.qualifier"
token="Bundle-Version: 7.0.2.qualifier"
value="Bundle-Version: ${parsedVersion.osgiVersion}"/>
</tasks>
</configuration>

5
jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
View File

@ -36,6 +36,11 @@ public class FragmentActivator implements BundleActivator
*/
public void start(BundleContext context) throws Exception {
WebappRegistrationHelper.JSP_REGISTRATION_HELPERS.add(new WebappRegistrationCustomizerImpl());
// try {
// FragmentActivator.class.getClassLoader().loadClass("does.not.exist");
// } catch (Throwable t) {
// t.printStackTrace();
// }
}
/**

2
jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Jetty-OSGi-Logback integration
Fragment-Host: org.eclipse.jetty.osgi.boot
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.logback;singleton:=true
Bundle-Version: 7.0.1.qualifier
Bundle-Version: 7.0.2.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: ch.qos.logback.classic,

4
jetty-osgi/jetty-osgi-boot-logback/pom.xml
View File

@ -7,7 +7,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>org.eclipse.jetty.osgi.boot.logback</artifactId>
<artifactId>jetty-osgi-boot-logback</artifactId>
<name>Jetty :: OSGi :: Boot Logback</name>
<description>Jetty OSGi Boot Logback bundle</description>
<dependencies>
@ -61,7 +61,7 @@
<configuration>
<tasks>
<replace file="target/classes/META-INF/MANIFEST.MF"
token="Bundle-Version: 7.0.1.qualifier"
token="Bundle-Version: 7.0.2.qualifier"
value="Bundle-Version: ${parsedVersion.osgiVersion}"/>
</tasks>
</configuration>

2
jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Support for rfc66 war url scheme
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.warurl;singleton:=true
Bundle-Version: 7.0.1.qualifier
Bundle-Version: 7.0.2.qualifier
Bundle-Activator: org.eclipse.jetty.osgi.boot.warurl.WarUrlActivator
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: J2SE-1.5

2
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
View File

@ -31,7 +31,7 @@
<configuration>
<tasks>
<replace file="target/classes/META-INF/MANIFEST.MF"
token="Bundle-Version: 7.0.1.qualifier"
token="Bundle-Version: 7.0.2.qualifier"
value="Bundle-Version: ${parsedVersion.osgiVersion}"/>
</tasks>
</configuration>

2
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Jetty OSGi bootstrap
Bundle-SymbolicName: org.eclipse.jetty.osgi.boot;singleton:=true
Bundle-Vendor: Mort Bay Consulting
Bundle-Version: 7.0.1.qualifier
Bundle-Version: 7.0.2.qualifier
Bundle-Activator: org.eclipse.jetty.osgi.boot.JettyBootstrapActivator
Import-Package: javax.mail;resolution:=optional,
javax.mail.event;resolution:=optional,

10
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
View File

@ -241,5 +241,15 @@
<Set name="sendServerVersion">true</Set>
<Set name="sendDateHeader">true</Set>
<Set name="gracefulShutdown">1000</Set>
<!-- jetty-jndi by default -->
<Call class="java.lang.System" name="setProperty">
<Arg>java.naming.factory.initial</Arg>
<Arg><SystemProperty name="java.naming.factory.initial" default="org.eclipse.jetty.jndi.InitialContextFactory"/></Arg>
</Call>
<Call class="java.lang.System" name="setProperty">
<Arg>java.naming.factory.url.pkgs</Arg>
<Arg><SystemProperty name="java.naming.factory.url.pkgs" default="org.eclipse.jetty.jndi"/></Arg>
</Call>
</Configure>

2
jetty-osgi/jetty-osgi-boot/pom.xml
View File

@ -39,7 +39,7 @@
<configuration>
<tasks>
<replace file="target/classes/META-INF/MANIFEST.MF"
token="Bundle-Version: 7.0.1.qualifier"
token="Bundle-Version: 7.0.2.qualifier"
value="Bundle-Version: ${parsedVersion.osgiVersion}"/>
</tasks>
</configuration>

1
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/JettyBootstrapActivator.java
View File

@ -27,6 +27,7 @@ import org.eclipse.jetty.webapp.WebAppContext;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceRegistration;
/**

16
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebappRegistrationHelper.java
View File

@ -276,7 +276,7 @@ public class WebappRegistrationHelper
properties.put("jetty.host",System.getProperty("jetty.host",""));
properties.put("jetty.port",System.getProperty("jetty.port","8080"));
properties.put("jetty.port.ssl",System.getProperty("jetty.port.ssl","8443"));
while (tokenizer.hasMoreTokens())
{
String etcFile = tokenizer.nextToken().trim();
@ -345,20 +345,6 @@ public class WebappRegistrationHelper
*/
private void init()
{
// [Hugues] if no jndi is setup let's do it.
// we could also get the bundle for jetty-jndi and open the
// corresponding properties file
// instead of hardcoding the values: but they are unlikely to change.
if (System.getProperty("java.naming.factory.initial") == null)
{
System.setProperty("java.naming.factory.initial","org.eclipse.jetty.jndi.InitialContextFactory");
}
if (System.getProperty("java.naming.factory.url.pkgs") == null)
{
System.setProperty("java.naming.factory.url.pkgs","org.eclipse.jetty.jndi");
}
// Get the context handler
_ctxtHandler = (ContextHandlerCollection)_server.getChildHandlerByClass(ContextHandlerCollection.class);

3
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/PackageAdminServiceTracker.java
View File

@ -94,7 +94,8 @@ public class PackageAdminServiceTracker implements ServiceListener
// find a convention to look for a class inside the fragment.
try
{
Class<?> c = Class.forName(frag.getSymbolicName() + ".FragmentActivator");
String fragmentActivator = frag.getSymbolicName() + ".FragmentActivator";
Class<?> c = Class.forName(fragmentActivator);
if (c != null)
{
BundleActivator bActivator = (BundleActivator)c.newInstance();

2
jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: OSGi HttpService provided by equinox HttpServiceServlet deployed on jetty
Bundle-SymbolicName: org.eclipse.jetty.osgi.httpservice
Bundle-Version: 7.0.1.qualifier
Bundle-Version: 7.0.2.qualifier
Bundle-Vendor: Mort Bay Consulting
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: javax.servlet;version="2.5.0",

2
jetty-osgi/jetty-osgi-httpservice/pom.xml
View File

@ -35,7 +35,7 @@
<configuration>
<tasks>
<replace file="target/classes/META-INF/MANIFEST.MF"
token="Bundle-Version: 7.0.1.qualifier"
token="Bundle-Version: 7.0.2.qualifier"
value="Bundle-Version: ${parsedVersion.osgiVersion}"/>
</tasks>
</configuration>