Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2895 - in branches/new-structure/trunk/surfnet_java-flowsa-ma: conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/axis-1.4/WEB-INF/classes/nl conf/axis-1.4/WEB-INF/classes/nl/surfnet conf/axis-1.4/WEB-INF/classes/nl/surfnet/web src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders

Subject: perfsonar development work

List archive

perfsonar: r2895 - in branches/new-structure/trunk/surfnet_java-flowsa-ma: conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/axis-1.4/WEB-INF/classes/nl conf/axis-1.4/WEB-INF/classes/nl/surfnet conf/axis-1.4/WEB-INF/classes/nl/surfnet/web src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2895 - in branches/new-structure/trunk/surfnet_java-flowsa-ma: conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/axis-1.4/WEB-INF/classes/nl conf/axis-1.4/WEB-INF/classes/nl/surfnet conf/axis-1.4/WEB-INF/classes/nl/surfnet/web src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders
  • Date: Tue, 2 Oct 2007 11:23:47 -0400
Author: gijs
Date: 2007-10-02 11:23:47 -0400 (Tue, 02 Oct 2007)
New Revision: 2895

Added:

branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/nl/

branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/nl/surfnet/

branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/nl/surfnet/web/

branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/nl/surfnet/web/IpAccessFilter.class

branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/nl/surfnet/web/IpAccessFilter.java
Modified:

branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml

branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
Log:
temp filter added

Added:
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/nl/surfnet/web/IpAccessFilter.class


Property changes on:
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/nl/surfnet/web/IpAccessFilter.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/classes/nl/surfnet/web/IpAccessFilter.java

Modified:
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
---
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
2007-10-02 15:22:42 UTC (rev 2894)
+++
branches/new-structure/trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
2007-10-02 15:23:47 UTC (rev 2895)
@@ -1,83 +1,104 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>

<web-app>
- <display-name>Apache-Axis</display-name>
+ <display-name>Apache-Axis</display-name>

- <listener>
-
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
- </listener>
+ <filter>
+ <filter-name>ipfilter</filter-name>
+ <filter-class>nl.surfnet.web.IpAccessFilter</filter-class>
+ <init-param>
+ <param-name>ips</param-name>
+ <param-value>127.0.0.1
2001:610:508:109:20b:dbff:fee9:61f3 62.131.17.150</param-value>
+ <description>
+ A space separeted list of ips that are
allowed to access
+ resources.
+ </description>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>ipfilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>

- <listener>
-
<listener-class>org.perfsonar.service.base.container.listeners.StartupInitializer</listener-class>
- </listener>
+ <listener>
+ <listener-class>
+ org.apache.axis.transport.http.AxisHTTPSessionListener
+ </listener-class>
+ </listener>

- <servlet>
- <servlet-name>AxisServlet</servlet-name>
- <display-name>Apache-Axis Servlet</display-name>
- <servlet-class>
- org.apache.axis.transport.http.AxisServlet
- </servlet-class>
- </servlet>
+ <listener>
+ <listener-class>
+
org.perfsonar.service.base.container.listeners.StartupInitializer
+ </listener-class>
+ </listener>

- <servlet>
- <servlet-name>SOAPMonitorService</servlet-name>
- <display-name>SOAPMonitorService</display-name>
- <servlet-class>
- org.apache.axis.monitor.SOAPMonitorService
- </servlet-class>
- <init-param>
- <param-name>SOAPMonitorPort</param-name>
- <param-value>5001</param-value>
- </init-param>
- <load-on-startup>100</load-on-startup>
- </servlet>
+ <servlet>
+ <servlet-name>AxisServlet</servlet-name>
+ <display-name>Apache-Axis Servlet</display-name>
+ <servlet-class>
+ org.apache.axis.transport.http.AxisServlet
+ </servlet-class>
+ </servlet>

- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/servlet/AxisServlet</url-pattern>
- </servlet-mapping>
+ <servlet>
+ <servlet-name>SOAPMonitorService</servlet-name>
+ <display-name>SOAPMonitorService</display-name>
+ <servlet-class>
+ org.apache.axis.monitor.SOAPMonitorService
+ </servlet-class>
+ <init-param>
+ <param-name>SOAPMonitorPort</param-name>
+ <param-value>5001</param-value>
+ </init-param>
+ <load-on-startup>100</load-on-startup>
+ </servlet>

- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>*.jws</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/servlet/AxisServlet</url-pattern>
+ </servlet-mapping>

- <servlet-mapping>
- <servlet-name>AxisServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>*.jws</url-pattern>
+ </servlet-mapping>

- <servlet-mapping>
- <servlet-name>SOAPMonitorService</servlet-name>
- <url-pattern>/SOAPMonitor</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>

- <session-config>
- <!-- Default to 5 minute session timeouts -->
- <session-timeout>5</session-timeout>
- </session-config>
+ <servlet-mapping>
+ <servlet-name>SOAPMonitorService</servlet-name>
+ <url-pattern>/SOAPMonitor</url-pattern>
+ </servlet-mapping>

- <!-- currently the W3C havent settled on a media type for WSDL;
- http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
- for now we go with the basic 'it's XML' response -->
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
+ <session-config>
+ <!-- Default to 5 minute session timeouts -->
+ <session-timeout>5</session-timeout>
+ </session-config>

- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.jws</welcome-file>
- </welcome-file-list>
-
-</web-app>
+ <!-- currently the W3C havent settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.jws</welcome-file>
+ </welcome-file-list>
+
+</web-app>

Modified:
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
===================================================================
---
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
2007-10-02 15:22:42 UTC (rev 2894)
+++
branches/new-structure/trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders/Nfdump1_5_5OutputReaderImpl.java
2007-10-02 15:23:47 UTC (rev 2895)
@@ -190,8 +190,7 @@
datum.setTimeLastSeen(values[3]);
datum.setMsecLastSeen(values[4]);
datum.setProtocol(values[5]);
- datum.setTopStatistic(intSetToIp(values[6],
values[7], values[8],
- values[9]));
+ datum.setTopStatistic(intSetToIp(values[6],
values[7], values[8], values[9]));
datum.setFlows(values[10]);
datum.setPackets(values[11]);
datum.setBytes(values[12]);
@@ -238,11 +237,9 @@
record.setTimeLastSeen(values[3]);
record.setMsecLastSeen(values[4]);
record.setProtocol(values[5]);
- record.setSourceAddress(intSetToIp(values[6], values[7],
values[8],
- values[9]));
+ record.setSourceAddress(intSetToIp(values[6], values[7],
values[8], values[9]));
record.setSourcePort(values[10]);
- record.setDestinationAdress(intSetToIp(values[11], values[12],
- values[13], values[14]));
+ record.setDestinationAdress(intSetToIp(values[11],
values[12],values[13], values[14]));
record.setDestinationPort(values[15]);
record.setSourceAsNumber(values[16]);
record.setDestinationAsNumber(values[17]);


  • perfsonar: r2895 - in branches/new-structure/trunk/surfnet_java-flowsa-ma: conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/axis-1.4/WEB-INF/classes/nl conf/axis-1.4/WEB-INF/classes/nl/surfnet conf/axis-1.4/WEB-INF/classes/nl/surfnet/web src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/outputreaders, svnlog, 10/02/2007

Archive powered by MHonArc 2.6.16.

Top of Page