You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by kg...@apache.org on 2011/10/27 08:57:02 UTC
svn commit: r1189636 - in /felix/trunk/httplite: build.xml
src/main/java/org/apache/felix/httplite/osgi/Activator.java
src/main/java/org/apache/felix/httplite/server/Server.java
Author: kgilmer
Date: Thu Oct 27 06:57:01 2011
New Revision: 1189636
URL: http://svn.apache.org/viewvc?rev=1189636&view=rev
Log:
httplite: fix java 1.5+ annotations eclipse added to sources
Modified:
felix/trunk/httplite/build.xml
felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Activator.java
felix/trunk/httplite/src/main/java/org/apache/felix/httplite/server/Server.java
Modified: felix/trunk/httplite/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/build.xml?rev=1189636&r1=1189635&r2=1189636&view=diff
==============================================================================
--- felix/trunk/httplite/build.xml (original)
+++ felix/trunk/httplite/build.xml Thu Oct 27 06:57:01 2011
@@ -36,7 +36,7 @@
<target name="fetch" depends="clean" unless="${skip.fetch}">
<mkdir dir="${external.dir}" />
<exec executable="${wget.bin}" dir="${external.dir}">
- <arg value="http://www.meisei-u.ac.jp/mirror/apache/dist//felix/org.apache.felix.framework-3.2.2.jar" />
+ <arg value="http://www.meisei-u.ac.jp/mirror/apache/dist/felix/org.apache.felix.framework-4.0.1.jar" />
</exec>
<exec executable="${svn.bin}">
Modified: felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Activator.java?rev=1189636&r1=1189635&r2=1189636&view=diff
==============================================================================
--- felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Activator.java (original)
+++ felix/trunk/httplite/src/main/java/org/apache/felix/httplite/osgi/Activator.java Thu Oct 27 06:57:01 2011
@@ -55,7 +55,7 @@ public class Activator implements Bundle
/* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
- public void start(BundleContext context) throws Exception
+ public void start(BundleContext context) throws Exception
{
Logger logger = createLogger(context);
@@ -146,7 +146,7 @@ public class Activator implements Bundle
/* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
- public void stop(final BundleContext context) throws Exception
+ public void stop(final BundleContext context) throws Exception
{
if (m_httpServiceReg != null)
{
Modified: felix/trunk/httplite/src/main/java/org/apache/felix/httplite/server/Server.java
URL: http://svn.apache.org/viewvc/felix/trunk/httplite/src/main/java/org/apache/felix/httplite/server/Server.java?rev=1189636&r1=1189635&r2=1189636&view=diff
==============================================================================
--- felix/trunk/httplite/src/main/java/org/apache/felix/httplite/server/Server.java (original)
+++ felix/trunk/httplite/src/main/java/org/apache/felix/httplite/server/Server.java Thu Oct 27 06:57:01 2011
@@ -218,7 +218,7 @@ public class Server
m_serverSocket = new ServerSocket(m_port);
m_serverThread = new Thread(new Runnable()
{
- public void run()
+ public void run()
{
acceptConnections();
}