Author: musachy
Date: Thu May 8 09:03:50 2008
New Revision: 654570
URL: http://svn.apache.org/viewvc?rev=654570&view=rev
Log:
* Use fixed MANIFEST.MF (until felix maven plugin stops including "SNAPSHOT" in
Import-Package)
Added:
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/META-INF/
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/META-INF/MANIFEST.MF
Modified:
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/pom.xml
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/shell.ftl
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/shell.css
Modified: struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/pom.xml?rev=654570&r1=654569&r2=654570&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/pom.xml (original)
+++ struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/pom.xml Thu May 8
09:03:50 2008
@@ -1,9 +1,10 @@
-<?xml version="1.0"?>
-<project>
+<?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/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.struts2.osgi.admin</groupId>
- <artifactId>admin-bundle</artifactId>
- <packaging>bundle</packaging>
+ <groupId>org.apache.struts.osgi</groupId>
+ <artifactId>struts2-admin-bundle</artifactId>
+ <packaging>jar</packaging>
<name>Struts 2 OSGi Admin Bundle</name>
<version>1.0-SNAPSHOT</version>
@@ -21,6 +22,20 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>
+
src/main/resources/META-INF/MANIFEST.MF
+ </manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <!--
+ Commented out until
+ https://issues.apache.org/jira/browse/FELIX-549 is
solved
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -32,13 +47,17 @@
<Export-Package>
org.apache.struts2.osgi.admin*
</Export-Package>
-
<Import-Package>*,com.opensymphony.xwork2</Import-Package>
+ <Import-Package>
+ com.opensymphony.xwork2,
+ *
+ </Import-Package>
<Bundle-Activator>
org.apache.struts2.osgi.admin.MyBundleActivator
</Bundle-Activator>
</instructions>
</configuration>
</plugin>
+ -->
</plugins>
<pluginManagement>
<plugins>
Added:
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/META-INF/MANIFEST.MF?rev=654570&view=auto
==============================================================================
---
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/META-INF/MANIFEST.MF
(added)
+++
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/META-INF/MANIFEST.MF
Thu May 8 09:03:50 2008
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Export-Package: org.apache.struts2.osgi.admin.actions;uses:="org.apach
+ e.struts2.osgi.admin.services.shell,com.opensymphony.xwork2,com.opens
+ ymphony.xwork2.inject,com.opensymphony.xwork2.config,org.apache.strut
+ s2.dispatcher,com.opensymphony.xwork2.config.entities,org.osgi.framew
+ ork,org.apache.struts2.osgi.admin.services,org.apache.struts2.osgi",o
+ rg.apache.struts2.osgi.admin.services.shell;uses:="org.apache.felix.s
+ hell,org.osgi.framework,org.apache.struts2.osgi",org.apache.struts2.o
+ sgi.admin;uses:="org.apache.struts2.osgi",org.apache.struts2.osgi.adm
+ in.services;uses:="org.apache.struts2.osgi.admin.services.shell"
+Private-Package: osgi.admin,static
+Tool: Bnd-0.0.238
+Bundle-Name: Struts 2 OSGi Admin Bundle
+Created-By: Apache Maven Bundle Plugin
+Build-Jdk: 1.6.0_06
+Bundle-Version: 1.0.0.SNAPSHOT
+Bnd-LastModified: 1210254068174
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.apache.struts2.osgi.admin.MyBundleActivator
+Bundle-SymbolicName: org.apache.struts.osgi.struts2-admin-bundle
+Import-Package: com.opensymphony.xwork2,com.opensymphony.xwork2.config
+ ,com.opensymphony.xwork2.config.entities,com.opensymphony.xwork2.inje
+ ct,org.apache.felix.shell,org.apache.struts2.dispatcher
+ ,org.apache.struts2.osgi,org.apache.struts2.osgi.admin,org.apache.str
+ uts2.osgi.admin.actions,org.apache.struts2.osgi.admin.services,org.ap
+ ache.struts2.osgi.admin.services.shell,org.osgi.framework;version="1.
+ 3"
\ No newline at end of file
Modified:
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/shell.ftl
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/shell.ftl?rev=654570&r1=654569&r2=654570&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/shell.ftl
(original)
+++
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/osgi/admin/shell.ftl
Thu May 8 09:03:50 2008
@@ -25,6 +25,7 @@
<link rel="stylesheet" type="text/css" href="<@s.url value="/static/shell.css"
/>" />
<script src=" <@s.url value="/static/shell.js" />"></script>
<script src="<@s.url value="/static/dojo.js" />"></script>
+<link rel="stylesheet" type="text/css" href="<@s.url value="/static/main.css"
/>" />
<title>OSGi Console</title>
</head>
<body>
@@ -40,6 +41,7 @@
:->
</div>
<@s.url var="execUrl" namespace="/osgi/admin" action="execCommand" />
+ <label for"command">Command:</label>
<input name="command" onkeyup="keyEvent(event, '${execUrl}')"
class="wc-command" id="wc-command" type="text" />
</form>
</div>
Modified:
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/shell.css
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/shell.css?rev=654570&r1=654569&r2=654570&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/shell.css
(original)
+++
struts/sandbox/trunk/struts2-osgi-plugin/admin-bundle/src/main/resources/static/shell.css
Thu May 8 09:03:50 2008
@@ -18,23 +18,26 @@
* specific language governing permissions and limitations
* under the License.
*/
+#shell {
+ clear: both;
+}
.wc-results {
- overflow: auto;
- margin: 0px;
- padding: 5px;
- font-family: courier;
- color: white;
- background-color: black;
+ overflow: auto;
+ margin: 0px;
+ padding: 5px;
+ font-family: courier;
+ color: white;
+ background-color: black;
height: 400px;
}
.wc-results pre {
display: inline;
}
.wc-command {
- margin: 0px;
- font-family: courier;
- color: white;
- background-color: black;
+ margin: 0px;
+ font-family: courier;
+ color: white;
+ background-color: black;
width: 100%;
}
