Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3971 - in trunk/surfnet_java-flowsubscription-mp: . conf conf/axis-1.4 conf/axis-1.4/graphics src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard

Subject: perfsonar development work

List archive

perfsonar: r3971 - in trunk/surfnet_java-flowsubscription-mp: . conf conf/axis-1.4 conf/axis-1.4/graphics src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3971 - in trunk/surfnet_java-flowsubscription-mp: . conf conf/axis-1.4 conf/axis-1.4/graphics src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard
  • Date: Fri, 6 Jun 2008 17:30:19 -0400
Author: michael.bischoff
Date: 2008-06-06 17:30:19 -0400 (Fri, 06 Jun 2008)
New Revision: 3971

Removed:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/index_sqlma.html
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/main.css
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/sqlma_admin_script.js
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/welcome.htm
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/welcome_sqlma.htm
Modified:

trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_1_bottom.gif

trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_1_slice.gif

trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_1_top.gif

trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_2_bottom.gif

trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_2_slice.gif

trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_2_top.gif
trunk/surfnet_java-flowsubscription-mp/conf/components.properties
trunk/surfnet_java-flowsubscription-mp/conf/service.properties
trunk/surfnet_java-flowsubscription-mp/conf/servlet.properties
trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties
trunk/surfnet_java-flowsubscription-mp/pom.xml

trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/WizardHandler.java
Log:
Fixed Webadmin
- fixed ordering
- fixed artifacts
- added missing configuration options
- fixed enabled & on/off groups.
Other small cleanups

Modified:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_1_bottom.gif
===================================================================
(Binary files differ)

Modified:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_1_slice.gif
===================================================================
(Binary files differ)

Modified:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_1_top.gif
===================================================================
(Binary files differ)

Modified:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_2_bottom.gif
===================================================================
(Binary files differ)

Modified:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_2_slice.gif
===================================================================
(Binary files differ)

Modified:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/graphics/step_2_top.gif
===================================================================
(Binary files differ)

Deleted: trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/index_sqlma.html

Deleted: trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/main.css

Deleted:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/sqlma_admin_script.js

Deleted: trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/welcome.htm

Deleted:
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/welcome_sqlma.htm

Modified: trunk/surfnet_java-flowsubscription-mp/conf/components.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/components.properties
2008-06-06 13:10:58 UTC (rev 3970)
+++ trunk/surfnet_java-flowsubscription-mp/conf/components.properties
2008-06-06 21:30:19 UTC (rev 3971)
@@ -10,15 +10,8 @@
# Simple scheduler

ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler

-# Context implementation
-context=org.perfsonar.base.auxiliary.components.context.inMemory.InMemoryContext
+#Registration in LS
+#the service will load this component depending on service.r.ls_url has a
valid value in service.properties
+registrator=org.perfsonar.service.base.registration.LSRegistrationComponent

-# workaround helper
-ls_Helper=org.perfsonar.service.measurementPoint.flowsubscription.LSHelper
-
-# - DO NOT USE - Registration in LS
-# - DO NOT USE - the service will load this component depending on
service.r.ls_url has a valid value in service.properties
-# - DO NOT USE -
registrator=org.perfsonar.service.base.registration.LSRegistrationComponent
-
-authn=org.perfsonar.commons.auxiliary.components.authn.wssec.WSSecAuthNComponent
-
+authn=org.perfsonar.commons.auxiliary.components.authn.wssec.WSSecAuthNComponent
\ No newline at end of file

Modified: trunk/surfnet_java-flowsubscription-mp/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/service.properties
2008-06-06 13:10:58 UTC (rev 3970)
+++ trunk/surfnet_java-flowsubscription-mp/conf/service.properties
2008-06-06 21:30:19 UTC (rev 3971)
@@ -82,19 +82,19 @@

# Group=Subscription
# Description= which versions of netflow can we export
-service.mp.flow.netflow_versions = netflow_v9,netflow_v5,sflow
+service.mp.flow.netflow_versions=netflow_v9,netflow_v5,sflow

# Group=Subscription
# Description= what t.p. for netflow data do we support
-service.mp.flow.transport_protocols = udp,tcp,sctp,pr-sctp
+service.mp.flow.transport_protocols=udp,tcp,sctp,pr-sctp

# Group=Subscription
# Description= at what rate is the netflow data sampled
-service.mp.flow.sample_rate = 100
+service.mp.flow.sample_rate=100

# Group=Subscription
# Description= maximum client netflow subscriptions
-service.mp.flow.max_conn = 20
+service.mp.flow.max_conn=20

### network layout
service.mp.flow.router.0.name=arthur
@@ -121,6 +121,18 @@
service.mp.flow.router.3.flowport=29004
service.mp.flow.router.3.interfaces=1,2,3,4,5,6

+service.mp.flow.router.4.name=router4
+service.mp.flow.router.4.enabled=false
+service.mp.flow.router.4.address=127.0.0.1
+service.mp.flow.router.4.flowport=6999
+service.mp.flow.router.4.interfaces=1,2,3,4,5,6
+
+service.mp.flow.router.5.name=router5
+service.mp.flow.router.5.enabled=false
+service.mp.flow.router.5.address=127.0.0.1
+service.mp.flow.router.5.flowport=6999
+service.mp.flow.router.5.interfaces=1,2,3,4,5,6
+
### application locations

# Group=Applications

Modified: trunk/surfnet_java-flowsubscription-mp/conf/servlet.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/servlet.properties
2008-06-06 13:10:58 UTC (rev 3970)
+++ trunk/surfnet_java-flowsubscription-mp/conf/servlet.properties
2008-06-06 21:30:19 UTC (rev 3971)
@@ -1,7 +1,7 @@
#The type of the service
servlet.service_type=flowsubscription
#The ConfigurationHandler interface implementation used by the Wizard Servlet
-servlet.wizard.external_handler=perfSONARWebAdmin.admin.wizard.services.RRDMAHandler

+servlet.wizard.external_handler=org.perfsonar.service.measurementPoint.flowsubscription.wizard.WizardHandler
#The username used for authentication reasons when accessing properties
configuration and Wizard servlets
servlet.username=perfsonaruser
#The password used for authentication reasons when accessing properties
configuration and Wizard servlets

Modified: trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties
2008-06-06 13:10:58 UTC (rev 3970)
+++ trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties
2008-06-06 21:30:19 UTC (rev 3971)
@@ -97,37 +97,85 @@
</property>

<property>
+ <entry key="service.as.authn_active">on</entry>
+ <Comment>Activate authentication for this service?</Comment>
+ <ProposedValue>on</ProposedValue>
+ <Group order="1" check="true">Authentication</Group>
+ <AcceptedValue>off</AcceptedValue>
+ <AcceptedValue>on</AcceptedValue>
+ </property>
+ <property>
+ <entry
key="service.as.authn_for_msg_types">SubscriptionRequest,UnSubscriptionRequest,SubscriptionKeepaliveRequest</entry>
+ <Comment>Message types for which authentication is needed.</Comment>
+
<ProposedValue>SubscriptionRequest,UnSubscriptionRequest,SubscriptionKeepaliveRequest</ProposedValue>
+ <Group order="2">Authentication</Group>
+ </property>
+ <property>
+ <entry
key="service.as.point">http://localhost:8080/perfSONAR-AS/services/AuthService</entry>
+ <Comment>AS address</Comment>
+
<ProposedValue>http://localhost:8080/perfSONAR-AS/services/AuthService</ProposedValue>
+ <Group order="3">Authentication</Group>
+ </property>
+
+ <property>
<entry key="service.mp.flow.inPort">11110</entry>
<Comment>port (and up) that the zebedee client should receive data
at</Comment>
<ProposedValue>11110</ProposedValue>
- <Group order="1">Tunnel</Group>
+ <Group order="1">Subscriptions</Group>
</property>
<property>
<entry key="service.mp.flow.betweenPort">22220</entry>
<Comment>port (and up) that the zebedee client should use for sending
data (and listen for reverse connection setup from server</Comment>
<ProposedValue>22220</ProposedValue>
- <Group order="2">Tunnel</Group>
+ <Group order="2">Subscriptions</Group>
</property>
<property>
<entry key="service.mp.flow.max_conn">20</entry>
<Comment>maximum client netflow subscriptions</Comment>
- <ProposedValue>22220</ProposedValue>
- <Group order="2">Tunnel</Group>
+ <ProposedValue>20</ProposedValue>
+ <Group order="3">Subscriptions</Group>
</property>

<property>
+ <entry key="service.mp.flow.zebedee">/usr/bin/zebedee</entry>
+ <Comment>zebedee executable</Comment>
+ <ProposedValue>/usr/bin/zebedee</ProposedValue>
+ <Group order="1">Applications</Group>
+ </property>
+ <property>
+ <entry key="service.mp.flow.nfdump">/usr/local/bin/nfdump</entry>
+ <Comment>nfdump executable</Comment>
+ <ProposedValue>/usr/local/bin/nfdump</ProposedValue>
+ <Group order="2">Applications</Group>
+ </property>
+ <property>
+ <entry key="service.mp.flow.nfcapd">/usr/local/bin/nfcapd</entry>
+ <Comment>nfcapd executable</Comment>
+ <ProposedValue>/usr/local/bin/nfcapd</ProposedValue>
+ <Group order="3">Applications</Group>
+ </property>
+ <property>
+ <entry key="service.mp.flow.nfreplay">/usr/local/bin/nfreplay</entry>
+ <Comment>nfreplay executable</Comment>
+ <ProposedValue>/usr/local/bin/nfreplay</ProposedValue>
+ <Group order="4">Applications</Group>
+ </property>
+
+ <property>
+ <entry key="service.mp.flow.router.0.enabled">true</entry>
+ <Comment>Is this router enabled?</Comment>
+ <ProposedValue>true</ProposedValue>
+ <Group order="1" check="true">router1</Group>
+ <AcceptedValue>false</AcceptedValue>
+ <AcceptedValue>true</AcceptedValue>
+ </property>
+ <property>
<entry key="service.mp.flow.router.0.name">router1</entry>
<Comment>name of the router</Comment>
- <ProposedValue>router1</ProposedValue>
- <Group order="1">router1</Group>
+ <ProposedValue>router1</ProposedValue>
+ <Group order="2">router1</Group>
</property>
<property>
- <entry key="service.mp.flow.router.0.enabled">false</entry>
- <Comment>Is this router enabled</Comment>
- <ProposedValue>false</ProposedValue>
- <Group order="2">router1</Group>
- </property>
- <property>
<entry key="service.mp.flow.router.0.address">127.0.0.1</entry>
<Comment>Address of the exporter</Comment>
<ProposedValue>127.0.0.1</ProposedValue>
@@ -137,22 +185,24 @@
<entry key="service.mp.flow.router.0.flowport">6669</entry>
<Comment>Portnumber</Comment>
<ProposedValue>6669</ProposedValue>
- <Group order="3">router1</Group>
- </property>
+ <Group order="4">router1</Group>
+ </property>

<property>
- <entry key="service.mp.flow.router.1.name">router1</entry>
+ <entry key="service.mp.flow.router.1.enabled">true</entry>
+ <Comment>Is this router enabled?</Comment>
+ <ProposedValue>true</ProposedValue>
+ <Group order="1" check="true">router2</Group>
+ <AcceptedValue>false</AcceptedValue>
+ <AcceptedValue>true</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.mp.flow.router.1.name">router2</entry>
<Comment>name of the router</Comment>
- <ProposedValue>router1</ProposedValue>
- <Group order="1">router2</Group>
+ <ProposedValue>router2</ProposedValue>
+ <Group order="2">router2</Group>
</property>
<property>
- <entry key="service.mp.flow.router.1.enabled">false</entry>
- <Comment>Is this router enabled</Comment>
- <ProposedValue>false</ProposedValue>
- <Group order="2">router2</Group>
- </property>
- <property>
<entry key="service.mp.flow.router.1.address">127.0.0.1</entry>
<Comment>Address of the exporter</Comment>
<ProposedValue>127.0.0.1</ProposedValue>
@@ -162,22 +212,24 @@
<entry key="service.mp.flow.router.1.flowport">6669</entry>
<Comment>Portnumber</Comment>
<ProposedValue>6669</ProposedValue>
- <Group order="3">router2</Group>
+ <Group order="4">router2</Group>
</property>

<property>
- <entry key="service.mp.flow.router.2.name">router1</entry>
+ <entry key="service.mp.flow.router.2.enabled">true</entry>
+ <Comment>Is this router enabled?</Comment>
+ <ProposedValue>true</ProposedValue>
+ <Group order="1" check="true">router3</Group>
+ <AcceptedValue>false</AcceptedValue>
+ <AcceptedValue>true</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.mp.flow.router.2.name">router3</entry>
<Comment>name of the router</Comment>
- <ProposedValue>router1</ProposedValue>
- <Group order="1">router3</Group>
+ <ProposedValue>router3</ProposedValue>
+ <Group order="2">router3</Group>
</property>
<property>
- <entry key="service.mp.flow.router.2.enabled">false</entry>
- <Comment>Is this router enabled</Comment>
- <ProposedValue>false</ProposedValue>
- <Group order="2">router3</Group>
- </property>
- <property>
<entry key="service.mp.flow.router.2.address">127.0.0.1</entry>
<Comment>Address of the exporter</Comment>
<ProposedValue>127.0.0.1</ProposedValue>
@@ -187,22 +239,24 @@
<entry key="service.mp.flow.router.2.flowport">6669</entry>
<Comment>Portnumber</Comment>
<ProposedValue>6669</ProposedValue>
- <Group order="3">router3</Group>
+ <Group order="4">router3</Group>
</property>

- <property>
- <entry key="service.mp.flow.router.3.name">router1</entry>
+ <property>
+ <entry key="service.mp.flow.router.3.enabled">true</entry>
+ <Comment>Is this router enabled?</Comment>
+ <ProposedValue>true</ProposedValue>
+ <Group order="1" check="true">router4</Group>
+ <AcceptedValue>false</AcceptedValue>
+ <AcceptedValue>true</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.mp.flow.router.3.name">router4</entry>
<Comment>name of the router</Comment>
- <ProposedValue>router1</ProposedValue>
- <Group order="1">router4</Group>
+ <ProposedValue>router4</ProposedValue>
+ <Group order="2">router4</Group>
</property>
<property>
- <entry key="service.mp.flow.router.3.enabled">false</entry>
- <Comment>Is this router enabled</Comment>
- <ProposedValue>false</ProposedValue>
- <Group order="2">router4</Group>
- </property>
- <property>
<entry key="service.mp.flow.router.3.address">127.0.0.1</entry>
<Comment>Address of the exporter</Comment>
<ProposedValue>127.0.0.1</ProposedValue>
@@ -212,8 +266,35 @@
<entry key="service.mp.flow.router.3.flowport">6669</entry>
<Comment>Portnumber</Comment>
<ProposedValue>6669</ProposedValue>
- <Group order="3">router4</Group>
+ <Group order="4">router4</Group>
</property>
-
+
+ <property>
+ <entry key="service.mp.flow.router.4.enabled">true</entry>
+ <Comment>Is this router enabled?</Comment>
+ <ProposedValue>true</ProposedValue>
+ <Group order="1" check="true">router5</Group>
+ <AcceptedValue>false</AcceptedValue>
+ <AcceptedValue>true</AcceptedValue>
+ </property>
+ <property>
+ <entry key="service.mp.flow.router.4.name">router5</entry>
+ <Comment>name of the router</Comment>
+ <ProposedValue>router3</ProposedValue>
+ <Group order="2">router5</Group>
+ </property>
+ <property>
+ <entry key="service.mp.flow.router.4.address">127.0.0.1</entry>
+ <Comment>Address of the exporter</Comment>
+ <ProposedValue>127.0.0.1</ProposedValue>
+ <Group order="3">router5</Group>
+ </property>
+ <property>
+ <entry key="service.mp.flow.router.4.flowport">6669</entry>
+ <Comment>Portnumber</Comment>
+ <ProposedValue>6669</ProposedValue>
+ <Group order="4">router5</Group>
+ </property>
+
</properties>


Modified: trunk/surfnet_java-flowsubscription-mp/pom.xml
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/pom.xml 2008-06-06 13:10:58
UTC (rev 3970)
+++ trunk/surfnet_java-flowsubscription-mp/pom.xml 2008-06-06 21:30:19
UTC (rev 3971)
@@ -139,7 +139,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.8.5b</version>
+ <version>0.8.6b</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>

Modified:
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/WizardHandler.java
===================================================================
---
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/WizardHandler.java
2008-06-06 13:10:58 UTC (rev 3970)
+++
trunk/surfnet_java-flowsubscription-mp/src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard/WizardHandler.java
2008-06-06 21:30:19 UTC (rev 3971)
@@ -19,6 +19,7 @@
import perfSONARWebAdmin.auxiliary.PerfsonarProperty;
import perfSONARWebAdmin.auxiliary.ServiceProperties;
import perfSONARWebAdmin.auxiliary.ServicePropertiesImpl;
+import perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler;
import perfSONARWebAdmin.auxiliary.wizard.HTMLOutput;
import perfSONARWebAdmin.auxiliary.wizard.ServiceConfig;
import perfSONARWebAdmin.auxiliary.wizard.WizardProperties;
@@ -26,7 +27,7 @@
import perfSONARWebAdmin.auxiliary.xmlDB.xmlDBManager;
import perfSONARWebAdmin.auxiliary.xmlDB.xmlDBManagerImpl;

-public class WizardHandler implements ServiceConfig {
+public class WizardHandler implements ServiceConfig, ConfigurationHandler {

// Hashtable containg Wizard Properties as values and the various
groups in
// which the properties are divided to as keys
@@ -64,16 +65,16 @@
// Bollean that states if the configuration process is finished
private static boolean configured = false;

- public void handleRequest(HttpServletRequest request) throws
Exception {
+ public boolean handleRequest(HttpServletRequest request) throws
Exception {
// Setting configured to false
configured = false;
-
+// don't need exist
+// try {
+// handleExist(request);
+// } catch (Exception e) {
+// throw new Exception("Problem with eXist
configuration!Please check your input.\n" + getFault(e));
+// }
try {
- handleExist(request);
- } catch (Exception e) {
- throw new Exception("Problem with eXist
configuration!Please check your input.\n" + getFault(e));
- }
- try {
handleLS(request);
} catch (Exception e) {
throw new Exception("Problem with LS
configuration!Please check your input.\n" + getFault(e));
@@ -83,6 +84,8 @@
} catch (Exception e) {
throw new Exception("Problem with Store
configuration!Please check your input.\n" + getFault(e));
}
+ configured = true;
+ return true;
}

public boolean isConfigured() {


  • perfsonar: r3971 - in trunk/surfnet_java-flowsubscription-mp: . conf conf/axis-1.4 conf/axis-1.4/graphics src/main/java/org/perfsonar/service/measurementPoint/flowsubscription/wizard, svnlog, 06/06/2008

Archive powered by MHonArc 2.6.16.

Top of Page