[jboss-cvs] JBossAS SVN: r60525 - in projects/jaxr/trunk: src/resources and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 14 06:11:32 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-14 06:11:32 -0500 (Wed, 14 Feb 2007)
New Revision: 60525
Added:
projects/jaxr/trunk/src/resources/juddi-service.sar/
projects/jaxr/trunk/src/resources/juddi-service.sar/META-INF/
projects/jaxr/trunk/src/resources/juddi-service.sar/META-INF/jboss-service.xml
projects/jaxr/trunk/src/resources/juddi.war/
projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/
projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/jboss-web.xml
projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/juddi.properties
projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/web.xml
projects/jaxr/trunk/src/resources/juddi.war/index.html
projects/jaxr/trunk/src/resources/juddi.war/styles.css
Removed:
projects/jaxr/trunk/src/resources/juddi/axisconfig/
projects/jaxr/trunk/src/resources/juddi/ddl/
projects/jaxr/trunk/src/resources/juddi/jboss-service.xml
projects/jaxr/trunk/src/resources/juddi/jse/
Modified:
projects/jaxr/trunk/
projects/jaxr/trunk/pom.xml
Log:
Fix package
Property changes on: projects/jaxr/trunk
___________________________________________________________________
Name: svn:ignore
-
output-eclipse
output
+
output-eclipse
output
thirdparty
target
Modified: projects/jaxr/trunk/pom.xml
===================================================================
--- projects/jaxr/trunk/pom.xml 2007-02-14 09:21:46 UTC (rev 60524)
+++ projects/jaxr/trunk/pom.xml 2007-02-14 11:11:32 UTC (rev 60525)
@@ -4,7 +4,7 @@
<groupId>jboss</groupId>
<artifactId>jboss-jaxr</artifactId>
<packaging>jar</packaging>
- <version>2.0.0.GA</version>
+ <version>1.2.0.GA</version>
<name>JBoss Registry</name>
<url>http://labs.jboss.org/portal/jbossws/</url>
<description>JBoss JAXR</description>
@@ -92,36 +92,7 @@
</execution>
</executions>
</plugin>
- <!-- handle the retrieval and unpacking of dependencies
- required for the sar -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-jboss</id>
- <phase>process-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>jboss</groupId>
- <artifactId>jboss</artifactId>
- <version>5.0-SNAPSHOT</version>
- <type>jar</type>
- <outputDirectory> ${project.build.directory}/dependencies</outputDirectory>
- </artifactItem>
- </artifactItems>
- <outputDirectory> ${project.build.directory}</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
@@ -155,46 +126,63 @@
<phase>package</phase>
<configuration>
<tasks>
- <mkdir dir="${basedir}/output/lib"/>
+ <mkdir dir="${basedir}/target"/>
+ <!-- [TODO] show me how to use the dependency atrtifacts from the local repository -->
+ <property name="jboss.repository" value="http://repository.jboss.com"/>
+ <property name="thirdparty.dir" value="${basedir}/thirdparty"/>
+ <property name="apache-scout" value="0.7rc2"/>
+ <property name="juddi" value="0.9RC4"/>
+
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/apache-scout/${apache-scout}/lib/scout.jar" dest="${thirdparty.dir}/scout.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/juddi/${juddi}/lib/juddi.jar" dest="${thirdparty.dir}/juddi.jar" usetimestamp="true" verbose="true"/>
+
<!--juddi-service.jar-->
- <jar jarfile="${basedir}/output/lib/juddi-service.jar">
+ <jar jarfile="${basedir}/target/juddi-service.jar">
<fileset dir="${basedir}/output/classes">
<include name="org/jboss/jaxr/juddi/**"/>
</fileset>
</jar>
- <jar jarfile="${basedir}/output/lib/juddisaaj.jar">
+ <!--juddi-saaj.jar-->
+ <jar jarfile="${basedir}/target/juddi-saaj.jar">
<fileset dir="${basedir}/output/classes">
<include name="org/jboss/jaxr/juddi/transport/**"/>
</fileset>
</jar>
- <!--juddiws.war -->
- <war warfile="${basedir}/output/lib/juddiws.war" webxml="${basedir}/src/resources/juddi/jse/web.xml">
- <webinf dir="${basedir}/src/resources/juddi/jse">
- <include name="juddi*"/>
- <include name="jboss-web.xml"/>
- <exclude name="web.xml"/>
- </webinf>
- <classes dir="${basedir}/output/classes">
+ <!--juddi.war -->
+ <mkdir dir="${basedir}/target/juddi.war/WEB-INF/classes"/>
+ <copy todir="${basedir}/target/juddi.war">
+ <fileset dir="${basedir}/src/resources/juddi.war">
+ <include name="index.html"/>
+ <include name="styles.css"/>
+ <include name="WEB-INF/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/target/juddi.war/WEB-INF/classes">
+ <fileset dir="${basedir}/output/classes">
<include name="org/jboss/jaxr/juddi/JUDDIServlet.*"/>
- </classes>
- <lib dir="${juddi.juddi.lib}">
- <include name="juddi.jar"/>
- </lib>
- </war>
+ </fileset>
+ </copy>
<!--juddi-service.sar-->
- <jar jarfile="${basedir}/output/lib/juddi-service.sar">
- <metainf dir="${basedir}/src/resources/juddi">
- <include name="*.xml"/>
- <include name="ddl/*.ddl"/>
+ <jar jarfile="${basedir}/target/juddi-service.sar">
+ <metainf dir="${basedir}/src/resources/juddi-service.sar/META-INF">
+ <include name="jboss-service.xml"/>
+ <include name="ddl/**"/>
</metainf>
- <fileset dir="${basedir}/output/lib">
+ <fileset dir="${basedir}/target">
<include name="juddi-service.jar"/>
+ <include name="juddi-saaj.jar"/>
+ <include name="juddi.war/**"/>
</fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="juddi.jar"/>
+ <include name="scout.jar"/>
+ </fileset>
</jar>
</tasks>
@@ -211,6 +199,7 @@
<dependency>
<groupId>apache-scout</groupId>
<artifactId>scout</artifactId>
+ <!-- Keep this version in sync with the artifact that is packaged in the juddi-service.sar -->
<version>0.7rc2</version>
</dependency>
<dependency>
@@ -246,6 +235,7 @@
<dependency>
<groupId>juddi</groupId>
<artifactId>juddi</artifactId>
+ <!-- Keep this version in sync with the artifact that is packaged in the juddi-service.sar -->
<version>0.9RC4</version>
</dependency>
<dependency>
Deleted: projects/jaxr/trunk/src/resources/juddi/jboss-service.xml
===================================================================
--- projects/jaxr/trunk/src/resources/juddi/jboss-service.xml 2007-02-14 09:21:46 UTC (rev 60524)
+++ projects/jaxr/trunk/src/resources/juddi/jboss-service.xml 2007-02-14 11:11:32 UTC (rev 60525)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE server>
-<server>
-
- <!-- The juddi service configration -->
- <mbean code="org.jboss.jaxr.juddi.JUDDIService"
- name="jboss:service=juddi">
- <!-- Whether we want to run the db initialization scripts -->
- <!-- Should all tables be created on Start-->
- <attribute name="CreateOnStart">false</attribute>
- <!-- Should all tables be dropped on Stop-->
- <attribute name="DropOnStop">true</attribute>
- <!-- Should all tables be dropped on Start-->
- <attribute name="DropOnStart">false</attribute>
- <!-- Datasource to Database-->
- <attribute name="DataSourceUrl">java:/DefaultDS</attribute>
- <!-- Alias to the registry-->
- <attribute name="RegistryOperator">RegistryOperator</attribute>
- <!-- Should I bind a Context to which JaxrConnectionFactory bound-->
- <attribute name="ShouldBindJaxr">true</attribute>
- <!-- Context to which JaxrConnectionFactory to bind to.
- If you have remote clients, please bind it to the global
- namespace(default behavior). To just cater to clients running
- on the same VM as JBoss, change to java:/JAXR -->
- <attribute name="BindJaxr">JAXR</attribute>
- <attribute name="DropDB">false</attribute>
- <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
- </mbean>
-</server>
Added: projects/jaxr/trunk/src/resources/juddi-service.sar/META-INF/jboss-service.xml
===================================================================
--- projects/jaxr/trunk/src/resources/juddi-service.sar/META-INF/jboss-service.xml (rev 0)
+++ projects/jaxr/trunk/src/resources/juddi-service.sar/META-INF/jboss-service.xml 2007-02-14 11:11:32 UTC (rev 60525)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE server>
+<server>
+
+ <!-- The juddi service configration -->
+ <mbean code="org.jboss.jaxr.juddi.JUDDIService"
+ name="jboss:service=juddi">
+ <!-- Whether we want to run the db initialization scripts -->
+ <!-- Should all tables be created on Start-->
+ <attribute name="CreateOnStart">false</attribute>
+ <!-- Should all tables be dropped on Stop-->
+ <attribute name="DropOnStop">true</attribute>
+ <!-- Should all tables be dropped on Start-->
+ <attribute name="DropOnStart">false</attribute>
+ <!-- Datasource to Database-->
+ <attribute name="DataSourceUrl">java:/DefaultDS</attribute>
+ <!-- Alias to the registry-->
+ <attribute name="RegistryOperator">RegistryOperator</attribute>
+ <!-- Should I bind a Context to which JaxrConnectionFactory bound-->
+ <attribute name="ShouldBindJaxr">true</attribute>
+ <!-- Context to which JaxrConnectionFactory to bind to.
+ If you have remote clients, please bind it to the global
+ namespace(default behavior). To just cater to clients running
+ on the same VM as JBoss, change to java:/JAXR -->
+ <attribute name="BindJaxr">JAXR</attribute>
+ <attribute name="DropDB">false</attribute>
+ <depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
+ </mbean>
+</server>
Property changes on: projects/jaxr/trunk/src/resources/juddi-service.sar/META-INF/jboss-service.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/jboss-web.xml
===================================================================
--- projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/jboss-web.xml (rev 0)
+++ projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/jboss-web.xml 2007-02-14 11:11:32 UTC (rev 60525)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>juddi</context-root>
+ <resource-ref>
+ <res-ref-name>jdbc/juddiDB</res-ref-name>
+ <jndi-name>java:/DefaultDS</jndi-name>
+ </resource-ref>
+</jboss-web>
\ No newline at end of file
Property changes on: projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/juddi.properties
===================================================================
--- projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/juddi.properties (rev 0)
+++ projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/juddi.properties 2007-02-14 11:11:32 UTC (rev 60525)
@@ -0,0 +1,54 @@
+# jUDDI Registry Properties (used by RegistryServer)
+# see http://www.juddi.org for more information
+
+# The UDDI Operator Name
+juddi.operatorName = jUDDI.org
+
+# The maximum name size and maximum number
+# of name elements allows in several of the
+# FindXxxx and SaveXxxx UDDI functions.
+juddi.maxNameLength=255
+juddi.maxNameElementsAllowed=5
+juddi.maxBusinessEntitiesPerUser=25
+juddi.maxBusinessServicesPerBusiness=20
+juddi.maxBindingTemplatesPerService=10
+juddi.maxTModelsPerUser=100
+juddi.maxRowsLimit=10
+
+# jUDDI Authentication module to use
+juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
+
+# jUDDI DataStore module currently to use
+juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
+
+
+# jUDDI UUIDGen implementation to use
+juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
+
+# jUDDI Monitor implementation to use
+#juddi.monitor = org.apache.juddi.monitor.jdbc.JDBCMonitor
+
+# jUDDI Cryptor implementation to use
+juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
+
+# jUDDI Validator to use
+juddi.validator=org.apache.juddi.validator.DefaultValidator
+
+# jUDDI DataSource to use
+juddi.dataSource=java:/DefaultDS
+
+
+# jUDDI Proxy Properties (used by RegistryProxy)
+juddi.proxy.adminURL = http://localhost:8080/juddi/admin
+juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
+juddi.proxy.publishURL = http://localhost:8080/juddi/publish
+juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
+juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
+juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
+
+# jUDDI HTTP Proxy Properties
+juddi.httpProxySet = true
+juddi.httpProxyHost = proxy.viens.net
+juddi.httpProxyPort = 8000
+juddi.httpProxyUserName = sviens
+juddi.httpProxyPassword = password
\ No newline at end of file
Added: projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/web.xml
===================================================================
--- projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/web.xml (rev 0)
+++ projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/web.xml 2007-02-14 11:11:32 UTC (rev 60525)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>JUDDIServlet</servlet-name>
+ <servlet-class>org.jboss.jaxr.juddi.JUDDIServlet</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>jUDDIRegistryServlet</servlet-name>
+ <servlet-class>org.apache.juddi.registry.RegistryServlet</servlet-class>
+ <init-param>
+ <param-name>juddi.propertiesFile</param-name>
+ <param-value>/WEB-INF/juddi.properties</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JUDDIServlet</servlet-name>
+ <url-pattern>/inquiry</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>JUDDIServlet</servlet-name>
+ <url-pattern>/publish</url-pattern>
+ </servlet-mapping>
+
+ <!-- ENABLE When Jboss Saaj implementation is not based on axis
+ <servlet>
+ <servlet-name>jUDDIAdminService</servlet-name>
+ <display-name>jUDDI Admin Service</display-name>
+ <servlet-class>org.apache.juddi.registry.AdminService</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>UDDIV2InquiryService</servlet-name>
+ <display-name>UDDI Version 2.0 Inquiry Service</display-name>
+ <servlet-class>org.apache.juddi.registry.InquiryService</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>UDDIV2PublishService</servlet-name>
+ <display-name>UDDI Version 2.0 Publish Service</display-name>
+ <servlet-class>org.apache.juddi.registry.PublishService</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>jUDDIAdminService</servlet-name>
+ <url-pattern>/admin</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>UDDIV2InquiryService</servlet-name>
+ <url-pattern>/inquiry</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>UDDIV2PublishService</servlet-name>
+ <url-pattern>/publish</url-pattern>
+ </servlet-mapping> -->
+
+ <resource-ref>
+ <description>jUDDI DataSource</description>
+ <res-ref-name>jdbc/juddiDB</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
+</web-app>
Property changes on: projects/jaxr/trunk/src/resources/juddi.war/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jaxr/trunk/src/resources/juddi.war/index.html
===================================================================
--- projects/jaxr/trunk/src/resources/juddi.war/index.html (rev 0)
+++ projects/jaxr/trunk/src/resources/juddi.war/index.html 2007-02-14 11:11:32 UTC (rev 60525)
@@ -0,0 +1,16 @@
+<html><head>
+<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>
+<title>JBoss JUDDI</title>
+<link rel='stylesheet' href='./styles.css'>
+</head>
+<body>
+
+<div class='pageHeader'>Welcome to JBoss JUDDI</div>
+
+This webapp accepts POST requests to:
+<p/>
+ <a href="./inquiry">/inquiry</a><br/>
+ <a href="./publish">/publish</a><br/>
+
+</body>
+</html>
Added: projects/jaxr/trunk/src/resources/juddi.war/styles.css
===================================================================
--- projects/jaxr/trunk/src/resources/juddi.war/styles.css (rev 0)
+++ projects/jaxr/trunk/src/resources/juddi.war/styles.css 2007-02-14 11:11:32 UTC (rev 60525)
@@ -0,0 +1,186 @@
+
+/* table for list views */
+.table_list {
+}
+
+/* table for detail views */
+.table_form {
+}
+
+.pageHeader {
+ font-size: 14pt;
+ font-weight: BOLD;
+ color: #ffffff;
+ border-bottom-width:1px;
+ border-bottom-style:solid;
+ border-color:#000066;
+ margin-bottom:15px;
+ padding-left:15px;
+ padding-top:5px;
+ padding-bottom:5px;
+ background-color: #aaaadd;
+ max-width: 900px;
+}
+
+.pageSection {
+ padding-left:15px;
+ margin-bottom: 5px;
+ max-width: 900px;
+}
+
+.metrics
+{
+ font-size: 6pt;
+ background-color: #dddddd;
+ width: 100%;
+}
+
+/* table row header */
+.list_tr_head {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ font-weight: 600;
+ text-align: center;
+ background-color: #aaaadd;
+}
+
+/* table row list view */
+.list_tr {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view odd lines */
+.list_tr_even {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #ffffff;
+}
+
+/* table row list view even lines */
+.list_tr_odd {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+}
+
+/* form label */
+.form_label {
+ font-family: Verdana, sans-serif;
+ font-weight: 500;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: top;
+ background-color: #dddddd;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+
+/* form value */
+.form_value {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ vertical-align: baseline;
+}
+
+/* tiny writing */
+.tiny {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #666666;
+}
+
+/* required input fields */
+.inputmust {
+ background-color: #dddddd;
+}
+
+/* error message */
+.error {
+ font-family: Courier New;
+ color: #990000;
+}
+
+/* error message */
+.error_trace {
+ font-family: Courier New;
+}
+
+/* active tree node */
+.tree_active_label {
+ font-weight: bold;
+}
+
+body {
+ font-family: Verdana,, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+ background-color: #ffffff;
+}
+
+/* title style */
+h1 {
+ font-family: Verdana, sans-serif;
+ font-size: 14pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h2 {
+ font-family: Verdana, sans-serif;
+ font-size: 12pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h3 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 600;
+ color: #000066;
+}
+
+h4 {
+ font-family: Verdana, sans-serif;
+ font-size: 10pt;
+ font-weight: 500;
+ color: #000066;
+}
+
+/* table desk */
+td {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+input, textarea, select, option {
+ font-family: Verdana, sans-serif;
+ font-size: 8pt;
+ color: #000066;
+}
+
+a {
+ font-family: Verdana, sans-serif;
+ color: #0000dd;
+ text-decoration: none;
+}
+
+a:hover{
+ font-family: Verdana, sans-serif;
+ color: #cc0000;
+ text-decoration: none;
+}
+
+pre {
+ background:#dddddd
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list