teiid SVN: r608 - trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/index.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-20 08:45:27 -0400 (Fri, 20 Mar 2009)
New Revision: 608
Modified:
trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/index/RuntimeIndexSelector.java
Log:
TEIID-427 adding better handling for expanding directory entries.
Modified: trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/index/RuntimeIndexSelector.java
===================================================================
--- trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/index/RuntimeIndexSelector.java 2009-03-20 02:37:03 UTC (rev 607)
+++ trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/index/RuntimeIndexSelector.java 2009-03-20 12:45:27 UTC (rev 608)
@@ -337,7 +337,11 @@
// create a file at the temporary location writing
// the contents of the zip entry to this file
File entryFile = new File(getIndexDirectoryPath(), entry.getName());
- FileUtils.write(zipInputStream, entryFile, length);
+ if (entryFile.isDirectory()) {
+ entryFile.mkdirs();
+ } else {
+ FileUtils.write(zipInputStream, entryFile, length);
+ }
if (SimpleIndexUtil.indexFileExists(entryFile)) {
tmp.add( new Index(entryFile.getAbsolutePath(), true) );
15 years, 2 months
teiid SVN: r607 - in trunk/server/src: test/java/com/metamatrix/admin/server and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-03-19 22:37:03 -0400 (Thu, 19 Mar 2009)
New Revision: 607
Modified:
trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java
trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java
Log:
TEIID-432 fix for bad exception when deassigning a connector binding
Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java 2009-03-19 22:26:17 UTC (rev 606)
+++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdminImpl.java 2009-03-20 02:37:03 UTC (rev 607)
@@ -29,6 +29,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -1583,22 +1584,20 @@
}
-
-
-
- private ConnectorBinding getConnectorBindingByName(String name) throws ConfigurationException, ServiceException {
+ private ConnectorBinding getConnectorBindingByName(String name) throws ConfigurationException, ServiceException, AdminProcessingException {
Configuration nextStartupConfig = getConfigurationServiceProxy().getNextStartupConfiguration();
ConnectorBinding cb = nextStartupConfig.getConnectorBinding(name);
+ if (cb == null) {
+ throw new AdminProcessingException(AdminServerPlugin.Util.getString("ServerConfigAdminImpl.Connector_Binding_not_found_in_Configuration", name)); //$NON-NLS-1$
+ }
return cb;
}
- protected List getConnectorBindingsByName(String[] bindingNames) throws ConfigurationException, ServiceException {
- List bindingList = new ArrayList(bindingNames.length);
+ protected List<ConnectorBinding> getConnectorBindingsByName(String[] bindingNames) throws ConfigurationException, ServiceException, AdminProcessingException {
+ List<ConnectorBinding> bindingList = new ArrayList<ConnectorBinding>(bindingNames.length);
- Configuration nextStartupConfig = getConfigurationServiceProxy().getNextStartupConfiguration();
for(int i=0; i<bindingNames.length; i++) {
- ConnectorBinding cb = nextStartupConfig.getConnectorBinding(bindingNames[i]);
- bindingList.add(cb);
+ bindingList.add(getConnectorBindingByName(bindingNames[i]));
}
return bindingList;
}
@@ -1720,61 +1719,55 @@
String modelName) throws AdminException {
try {
- List bindingList = getConnectorBindingsByName(connectorBindingNames);
- if (!bindingList.isEmpty()) {
+ List<ConnectorBinding> connectorList = getConnectorBindingsByName(connectorBindingNames);
- Collection colVdbs = getVirtualDatabases();
- if (colVdbs != null) {
- for (Iterator iter = colVdbs.iterator(); iter.hasNext();) {
- VirtualDatabase vdb = (VirtualDatabase)iter.next();
+ Collection colVdbs = getVirtualDatabases();
+ if (colVdbs == null) {
+ return;
+ }
+ for (Iterator iter = colVdbs.iterator(); iter.hasNext();) {
+ VirtualDatabase vdb = (VirtualDatabase)iter.next();
- if (vdb.getName().equals(vdbName) && vdb.getVirtualDatabaseID().getVersion().equals(vdbVersion)) {
- VirtualDatabaseID vdbId = (VirtualDatabaseID)vdb.getID();
- Collection models = getModels(vdbId);
+ if (vdb.getName().equals(vdbName) && vdb.getVirtualDatabaseID().getVersion().equals(vdbVersion)) {
+ VirtualDatabaseID vdbId = (VirtualDatabaseID)vdb.getID();
+ Collection models = getModels(vdbId);
- if (models != null) {
- HashMap map = new HashMap(models.size());
- Iterator modelIter = models.iterator();
- while (modelIter.hasNext()) {
- Model model = (Model)modelIter.next();
-
- if (model.getName().equals(modelName)) {
- if (model.getConnectorBindingNames().size() > 0) {
-
- // load all the existing bindings
- Set bindingSet = new HashSet(model.getConnectorBindingNames().size());
- bindingSet.addAll(model.getConnectorBindingNames());
-
- // remove the bindings passed in to be removed
- List toBeRemovedBindings = getConnectorBindingsByName(connectorBindingNames);
- Iterator toBeRemovedBindingsIter = toBeRemovedBindings.iterator();
- while(toBeRemovedBindingsIter.hasNext()) {
- ConnectorBinding toBeRemovedBinding = (ConnectorBinding)toBeRemovedBindingsIter.next();
- bindingSet.remove(toBeRemovedBinding.getRoutingUUID());
- }
-
- // convert the set to a list for the map
- List bindings = new ArrayList(model.getConnectorBindingNames().size());
- bindings.addAll(bindingSet);
- map.put(model.getName(), bindings);
- }
- } else {
- //put the original name in the map, because the user is not changing this
- map.put(model.getName(), model.getConnectorBindingNames());
- }
- }
-
- setConnectorBindingNames(vdbId, map);
-
+ if (models != null) {
+ HashMap map = new HashMap(models.size());
+ Iterator modelIter = models.iterator();
+ while (modelIter.hasNext()) {
+ Model model = (Model)modelIter.next();
+
+ if (model.getName().equals(modelName)) {
+ if (model.getConnectorBindingNames().size() > 0) {
+
+ // load all the existing bindings
+ Set bindingSet = new HashSet(model.getConnectorBindingNames().size());
+ bindingSet.addAll(model.getConnectorBindingNames());
+
+ // remove the bindings passed in to be removed
+ for (ConnectorBinding binding : connectorList) {
+ bindingSet.remove(binding.getRoutingUUID());
+ }
+
+ // convert the set to a list for the map
+ List bindings = new ArrayList(model.getConnectorBindingNames().size());
+ bindings.addAll(bindingSet);
+ map.put(model.getName(), bindings);
+ }
+ } else {
+ //put the original name in the map, because the user is not changing this
+ map.put(model.getName(), model.getConnectorBindingNames());
}
- setVDBState(vdbId, VDB.ACTIVE);
- // done
- break;
}
+
+ setConnectorBindingNames(vdbId, map);
+
}
+ setVDBState(vdbId, VDB.ACTIVE);
+ // done
+ break;
}
- } else {
- throw new AdminProcessingException(AdminServerPlugin.Util.getString("ServerConfigAdminImpl.Connector_Binding_not_found_in_Configuration")); //$NON-NLS-1$
}
} catch (VirtualDatabaseException e) {
throw new AdminComponentException(e);
Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java
===================================================================
--- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-03-19 22:26:17 UTC (rev 606)
+++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigAdminImpl.java 2009-03-20 02:37:03 UTC (rev 607)
@@ -30,6 +30,7 @@
import junit.framework.TestCase;
import com.metamatrix.admin.api.exception.AdminException;
+import com.metamatrix.admin.api.exception.AdminProcessingException;
import com.metamatrix.admin.api.objects.Host;
import com.metamatrix.core.util.ObjectConverterUtil;
import com.metamatrix.core.util.UnitTestUtil;
@@ -297,6 +298,22 @@
// Check results - expect to have no bindings
expectedBindingNames = new HashSet();
helpCheckBindings(model,expectedBindingNames);
+ }
+
+ public void testDeassignNonexistantBinding() throws Exception {
+ // The FakeConfiguration has 3 connectors available, connectorBinding1, 2 and 3.
+
+ // Assign multiple connector bindings, connectorBinding1 , 2 and 3
+ String[] bindings = new String[] {"connectorBinding1", "connectorBinding2", "connectorBinding3"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+ admin.assignBindingsToModel(bindings,VDB_NAME2,VERSION1,PHYSICAL_MODEL_NAME2);
+
+ String[] debindings = new String[] {"connectorBindingx"}; //$NON-NLS-1$
+ try {
+ admin.deassignBindingsFromModel(debindings,VDB_NAME2,VERSION1,PHYSICAL_MODEL_NAME2);
+ } catch (AdminProcessingException e) {
+ assertEquals("Connector Binding connectorBindingx not found in Configuration", e.getMessage()); //$NON-NLS-1$
+ }
}
public void testAddAuthenticationProvider() throws Exception {
15 years, 2 months
teiid SVN: r606 - trunk/engine/src/main/java/com/metamatrix/dqp/service.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-03-19 18:26:17 -0400 (Thu, 19 Mar 2009)
New Revision: 606
Modified:
trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java
Log:
TEIID-422 - Fix for compile error.
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java 2009-03-19 21:24:49 UTC (rev 605)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java 2009-03-19 22:26:17 UTC (rev 606)
@@ -26,6 +26,7 @@
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.application.ApplicationService;
+import com.metamatrix.core.CoreConstants;
import com.metamatrix.query.eval.SecurityFunctionEvaluator;
/**
@@ -45,7 +46,7 @@
public static final int CONTEXT_DELETE = 3;
public static final int CONTEXT_PROCEDURE = 4;
- public static final String DEFAULT_WSDL_USERNAME = CoreCon
+ public static final String DEFAULT_WSDL_USERNAME = CoreConstants.DEFAULT_ANON_USERNAME;
/**
* Determine which of a set of resources a connection does not have permission to
15 years, 2 months
teiid SVN: r605 - trunk/soap/src/main/webapp.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-03-19 17:24:49 -0400 (Thu, 19 Mar 2009)
New Revision: 605
Modified:
trunk/soap/src/main/webapp/index.jsp
trunk/soap/src/main/webapp/wsdlurlframe.htm
trunk/soap/src/main/webapp/wsdlurlgen.jsp
trunk/soap/src/main/webapp/wsdlurls.jsp
Log:
TEIID-422 - Changed HTTPServlet method signatures to reflect JDK 1.6 and update MM to JBEDSP.
Modified: trunk/soap/src/main/webapp/index.jsp
===================================================================
--- trunk/soap/src/main/webapp/index.jsp 2009-03-19 21:23:41 UTC (rev 604)
+++ trunk/soap/src/main/webapp/index.jsp 2009-03-19 21:24:49 UTC (rev 605)
@@ -1,8 +1,31 @@
<%@ page import="com.metamatrix.common.util.WSDLServletUtil" %>
+<!--
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+-->
<html>
<head>
- <title>MetaMatrix Web Service Utilities</title>
+ <title>JBEDSP Web Service Utilities</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css">
<!--
@@ -34,26 +57,27 @@
<div align="center">
<p><table width="900" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="#edf0f6">
- <td width="300">
- <a href="http://www.redhat.com/metamatrix"><img src="images/mmlogo.gif" border="no" title=""></img></a>
+ <td colspan="2" align="center">
+ <span class="MMSOAPTitle"><a href="http://www.jboss.com/products/platforms/dataservices/" target="_blank">JBoss Enterprise Data Services Platform (JBEDSP)</a></span>
</td>
- <td width="600">
- <span class="MMSOAPTitle">Web Service Utilities</span>
+ </tr>
+ <tr bgcolor="#edf0f6">
+ <td colspan="2" align="center">
+ <span class="MMSOAPTitle"> Web Service Utilities</span>
</td>
</tr>
<tr>
<td> <td>
- <td> <td>
</tr>
<tr>
- <td colspan="2" class="MMSOAPTitle"><b><u>MetaMatrix Web Service WSDL URL Generator</u></b><td>
+ <td colspan="2" class="MMSOAPTitle"><b><u>JBEDSP Web Service WSDL URL Generator</u></b><td>
</tr>
<tr>
<td> <td>
<td> <td>
</tr>
<tr>
- <td colspan="2"><b>VDBs that contain Web Service models expose WSDL when deployed to a MetaMatrix Server that describes the web service operations in those models. This form can be used to generate a parameterized WSDL URL for such a VDB.</b><td>
+ <td colspan="2"><b>VDBs that contain Web Service models expose WSDL when deployed to a JBEDSP Server that describes the web service operations in those models. This form can be used to generate a parameterized WSDL URL for such a VDB.</b><td>
</tr>
<tr>
<td> <td>
@@ -72,21 +96,21 @@
<td> <td>
</tr>
<tr>
- <td colspan="2" class="MMSOAPTitle"><b><u>Discover MetaMatrix Web Services</u></b><td>
+ <td colspan="2" class="MMSOAPTitle"><b><u>Discover JBEDSP Web Services</u></b><td>
</tr>
<tr>
<td> <td>
<td> <td>
</tr>
<tr>
- <td colspan="2"><b>To auto discover web service VDB WSDL URLs using predefined MetaMatrix server values, the MetaMatrix Server or cluster of MetaMatrix servers must be defined in the web.xml file of the MetaMatrix SOAP web application. Also, the defined WSDL user needs to be assigned the Admin.ReadOnlyAdmin role. This WSDL URL is more concise than the parameterized version, but is only valid with MetaMatrix SOAP web applications were the MetaMatrix server values have been defined.</b><td>
+ <td colspan="2"><b>To auto discover web service VDB WSDL URLs using predefined JBEDSP server values, the JBEDSP Server or cluster of JBEDSP servers must be defined in the web.xml file of the JBEDSP SOAP web application. This WSDL URL is more concise than the parameterized version, but is only valid with JBEDSP SOAP web applications were the JBEDSP server values have been defined.</b><td>
</tr>
<tr>
<td> <td>
<td> <td>
</tr>
<tr>
- <td><a href="<%= request.getContextpath() %>/servlet/DiscoverWSDLServlet" target="wsdlUrls" title="Discover MetaMatrix Web Services">Discover MetaMatrix Web Services</a><td>
+ <td><a href="<%= request.getContextPath() %>/servlet/DiscoverWSDLServlet" target="wsdlUrls" title="Discover MetaMatrix Web Services">Discover JBEDSP Web Services</a><td>
<td> <td>
</tr>
<tr>
@@ -112,7 +136,7 @@
<td> <td>
</tr>
<tr>
- <td align="left"><a target="_blank" href="<%= WSDLServletUtil.getSqlQueryWebServiceUrl(request.getServerName(), <%= request.getContextpath() %>, false) %>" title="SQL Query Web Service WSDL (Non-secure)">SQL Query Web Service WSDL (Non-secure)</a><td>
+ <td align="left"><a target="_blank" href="<%= WSDLServletUtil.getSqlQueryWebServiceUrl(request.getServerName(), request.getContextPath(), false) %>" title="SQL Query Web Service WSDL (Non-secure)">SQL Query Web Service WSDL (Non-secure)</a><td>
<td> <td>
</tr>
<tr>
@@ -120,7 +144,7 @@
<td> <td>
</tr>
<tr>
- <td align="left"><a target="_blank" href="<%= WSDLServletUtil.getSqlQueryWebServiceUrl(request.getServerName(), <%= request.getContextpath() %>, true) %>" title="SQL Query Web Service WSDL (Secure SSL)">SQL Query Web Service WSDL (Secure SSL)</a><td>
+ <td align="left"><a target="_blank" href="<%= WSDLServletUtil.getSqlQueryWebServiceUrl(request.getServerName(), request.getContextPath(), true) %>" title="SQL Query Web Service WSDL (Secure SSL)">SQL Query Web Service WSDL (Secure SSL)</a><td>
<td> <td>
</tr>
<tr>
Modified: trunk/soap/src/main/webapp/wsdlurlframe.htm
===================================================================
--- trunk/soap/src/main/webapp/wsdlurlframe.htm 2009-03-19 21:23:41 UTC (rev 604)
+++ trunk/soap/src/main/webapp/wsdlurlframe.htm 2009-03-19 21:24:49 UTC (rev 605)
@@ -1,7 +1,29 @@
-<!-- Copyright (c) 2000-2005 MetaMatrix, Inc. All rights reserved. -->
+<!--
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+-->
<HTML>
<HEAD>
- <TITLE>WSDL URL Generator</TITLE>
+ <TITLE>JBoss Enterprise Data Services Platform (JBEDSP) WSDL URL Generator</TITLE>
</HEAD>
<FRAMESET name="mainframeset" rows="85%,*" framespacing="2" >
<FRAME name="form" src="wsdlurlgen.jsp" MARGINHEIGHT="3" frameborder="1">
Modified: trunk/soap/src/main/webapp/wsdlurlgen.jsp
===================================================================
--- trunk/soap/src/main/webapp/wsdlurlgen.jsp 2009-03-19 21:23:41 UTC (rev 604)
+++ trunk/soap/src/main/webapp/wsdlurlgen.jsp 2009-03-19 21:24:49 UTC (rev 605)
@@ -4,17 +4,37 @@
<%@ page import="javax.naming.InitialContext" %>
<%@ page import="javax.naming.NamingException" %>
<html>
-<%/*
- * Copyright © 2000-2005 MetaMatrix, Inc.
- * All rights reserved.
- */
+<!--
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+-->
+<%
String targetServer = request.getServerName();
int targetPort = request.getServerPort();
%>
<head>
- <title>MetaMatrix WSDL URL Generator</title>
+ <title>JBoss Enterprise Data Services Platform (JBEDSP) WSDL URL Generator</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css">
<!--
@@ -22,8 +42,13 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 18pt;
font-style: normal;
- font-weight: bold
- }
+ font-weight: bold;
+ }
+
+ a {
+ visited : #666699; link: #666699; active: #666699;
+ hover: #1E90FF; text-decoration: none;
+ }
-->
.required { font-family: Arial, Helvetica, sans-serif; font-size: 10pt; color: red; font-weight: bold; }
</style>
@@ -32,29 +57,30 @@
<body bgcolor="#FFFFFF">
<div align="center">
<p>
- <table width="900" border="0" cellspacing="0" cellpadding="0">
- <tr bgcolor="#edf0f6">
- <td width="300">
- <a href="http:metamatrix.com"><img src="images/mmlogo.gif" border="no"></img></a>
- </td>
- <td width="600">
- <span class="MMSOAPTitle">MetaMatrix WSDL URL Generator</span>
- </td>
- </tr>
+ <table width="900" border="0" cellspacing="0" cellpadding="0">
+ <tr bgcolor="#edf0f6">
+ <td align="center"><span class="MMSOAPTitle">
+ <a href="http://www.jboss.com/products/platforms/dataservices/" target="_blank">JBoss Enterprise Data Services Platform (JBEDSP)</a></span>
+ </td>
+ </tr>
+ <tr bgcolor="#edf0f6">
+ <td align="center"><span class="MMSOAPTitle"> WSDL URL Generator</span>
+ </td>
+ </tr>
</table>
</p>
<p> </p>
- <form name="form" method="post" target="wsdlUrl" ACTION="<%= request.getContextpath() %>/servlet/WSDLURLGenerator">
- <p><b>MetaMatrix Server Information</b> (use commas to delimit multiple host:port combinations)</p>
+ <form name="form" method="post" target="wsdlUrl" ACTION="<%= request.getContextPath() %>/servlet/WSDLURLGenerator">
+ <p><b>JBEDSP Server Information</b> (use commas to delimit multiple host:port combinations)</p>
<table width="66%" border="0" cellspacing="0" cellpadding="0" bgcolor="#edf0f6">
<tr>
- <td width="48%"><b>MetaMatrix Server host:port</b><span class='required'> *</span> </td>
+ <td width="48%"><b>JBEDSP Server host:port</b><span class='required'> *</span> </td>
<td width="52%">
<input type="text" name="MMServerHostAndPort" value="<mmServerHost>:<mmServerPort>" size="80">
</td>
</tr>
</table>
- <p><b>MetaMatrix VDB Information</b> </p>
+ <p><b>JBEDSP VDB Information</b> </p>
<table width="25%" border="0" cellspacing="0" cellpadding="0" bgcolor="#edf0f6">
<tr>
<td width="54%">
@@ -88,7 +114,7 @@
</td>
</tr>
<tr>
- <td width="48%"><b>Use Secure MetaMatrix Protocol (mms) </b><span class='required'> *</span></td>
+ <td width="48%"><b>Use Secure JBEDSP Protocol (mms) </b><span class='required'> *</span></td>
<td width="52%">
<input type="checkbox" name="Secure" value="Secure">
</td>
Modified: trunk/soap/src/main/webapp/wsdlurls.jsp
===================================================================
--- trunk/soap/src/main/webapp/wsdlurls.jsp 2009-03-19 21:23:41 UTC (rev 604)
+++ trunk/soap/src/main/webapp/wsdlurls.jsp 2009-03-19 21:24:49 UTC (rev 605)
@@ -2,12 +2,32 @@
<%@ page import="com.metamatrix.soap.object.WSDLUrl"%>
<%@ page import="java.util.List"%>
<%@ page import="java.util.Iterator"%>
-
+<!--
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+-->
<html>
<%/*
- * Copyright � 2000-2008 MetaMatrix, Inc.
- * All rights reserved.
- */
+
List wsdlUrls = (List) session
.getAttribute(WSDLServletUtil.DISCOVERED_WSDL);
@@ -15,7 +35,7 @@
<head>
-<title>MetaMatrix WSDL URLs for Active Deployed Web Service Virtual
+<title>JBoss Enterprise Data Services Platform (JBEDSP) WSDL URLs for Active Deployed Web Service Virtual
Databases</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css">
@@ -40,9 +60,8 @@
<body bgcolor="#FFFFFF">
<table width="900" border="0" cellspacing="1" cellpadding="1">
<tr bgcolor="#edf0f6">
- <td width="300"><a href="http://www.redhat.com/metamatrix/"><img src="../images/mmlogo.gif"
- border="no"></img></a></td>
- <td width="600"><span class="MMSOAPTitle">MetaMatrix Active Web Service VDB
+ <td width="300"><span class="MMSOAPTitle"><a href="http://www.jboss.com/products/platforms/dataservices/">JBEDSP</a></td>
+ <td width="600">JBEDSP Active Web Service VDB
URLs</span></td>
</tr>
<tr>
15 years, 2 months
teiid SVN: r604 - trunk/soap/src/main/java/com/metamatrix/soap/servlet.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-03-19 17:23:41 -0400 (Thu, 19 Mar 2009)
New Revision: 604
Modified:
trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMDiscoverWSDLServlet.java
trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java
trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetWSDLServlet.java
trunk/soap/src/main/java/com/metamatrix/soap/servlet/WSDLURLGenerator.java
Log:
TEIID-422 - Updated logging to log4j and changed file location for JBossAS.
Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMDiscoverWSDLServlet.java
===================================================================
--- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMDiscoverWSDLServlet.java 2009-03-19 21:23:14 UTC (rev 603)
+++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMDiscoverWSDLServlet.java 2009-03-19 21:23:41 UTC (rev 604)
@@ -30,6 +30,8 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
import com.metamatrix.admin.api.exception.AdminException;
import com.metamatrix.api.exception.security.LogonException;
@@ -64,11 +66,6 @@
synchronized public void init( ServletConfig config ) throws ServletException {
super.init(config);
- String logFile = getServletContext().getInitParameter("logfile"); //$NON-NLS-1$
- File log = new File(logFile);
- logWriter = new FileLogWriter(log);
- platformLog.getPlatformLog().addListener(logWriter);
-
mmServer = getServletContext().getInitParameter("mmServer"); //$NON-NLS-1$
mmProtocol = getServletContext().getInitParameter("mmProtocol"); //$NON-NLS-1$
}
@@ -94,13 +91,13 @@
getServletConfig().getServletContext().getRequestDispatcher("/wsdlurls.jsp").forward(req, resp); //$NON-NLS-1$
} catch (LogonException e) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, e, e.getMessage());
+ log.error(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.2"), e);
resp.getOutputStream().println(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.2") + e.getMessage()); //$NON-NLS-1$
} catch (AdminException e) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, e, e.getMessage());
+ log.error(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.2"), e);
resp.getOutputStream().println(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.2") + e.getMessage()); //$NON-NLS-1$
} catch (Exception e) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, e, e.getMessage());
+ log.error(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.1"), e);
resp.getOutputStream().println(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.1") + e.getMessage()); //$NON-NLS-1$
}
}
Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java
===================================================================
--- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java 2009-03-19 21:23:14 UTC (rev 603)
+++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java 2009-03-19 21:23:41 UTC (rev 604)
@@ -45,6 +45,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.log4j.Logger;
+
import com.metamatrix.common.api.MMURL;
import com.metamatrix.common.util.WSDLServletUtil;
import com.metamatrix.core.CoreConstants;
@@ -81,19 +83,14 @@
/** DataService Endpoint */
private String dataServiceEndpoint = StringUtil.Constants.EMPTY_STRING;
- protected LogListener newListener = null;
- protected FileLogWriter logWriter = null;
-
- MMGetVDBResourcePlatformLog platformLog=MMGetVDBResourcePlatformLog.getInstance();
-
+ static Logger log = Logger.getLogger(MMGetVDBResourceServlet.class);
+
public MMGetVDBResourceServlet() {
}
synchronized public void init(ServletConfig config) throws ServletException {
super.init(config);
- String logFile=getServletContext().getInitParameter("logfile"); //$NON-NLS-1$
-
/* Check for override of Data Service endpoint. This is to allow for backwards compatibility
* of WSDL for pre-5.5 data services.
*/
@@ -101,10 +98,6 @@
if (dataServiceEndpoint==null || dataServiceEndpoint.equals(StringUtil.Constants.EMPTY_STRING)){
dataServiceEndpoint=DATASERVICE;
}
-
- File log = new File(logFile);
- logWriter=new FileLogWriter(log);
- platformLog.getPlatformLog().addListener(logWriter);
}
@@ -146,9 +139,7 @@
SOAPPlugin.Util.getString("MMGetVDBResourceServlet.Application_Name")); //$NON-NLS-1$
} catch (Exception e) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR,
- e,
- e.getMessage());
+ log.error(e);
resp.getOutputStream().println(e.getMessage());
return;
}
@@ -157,8 +148,7 @@
connection = getConnection(WebServiceUtil.WSDLUSER, WebServiceUtil.WSDLPASSWORD, vdbName, vdbVersion, serverURL);
} catch (Exception e) {
String message = SOAPPlugin.Util.getString(ErrorMessageKeys.SERVICE_0006); //;
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR,
- e, message);
+ log.error(message, e);
resp.getOutputStream().println(message);
return;
}
@@ -202,22 +192,16 @@
} catch (SQLException se) {
resp.getOutputStream().println(se.getMessage());
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR,
- se,
- SOAPPlugin.Util.getString("MMGetVDBResourceServlet.7")); //$NON-NLS-1$
+ log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.7"), se);
} catch (Exception e) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR,
- e,
- SOAPPlugin.Util.getString("MMGetVDBResourceServlet.8")); //$NON-NLS-1$
+ log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.8"), e);
resp.getOutputStream().println(e.getMessage());
} finally {
try {
//Cleanup our connection
connection.close();
} catch (SQLException e) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR,
- e,
- SOAPPlugin.Util.getString("MMGetVDBResourceServlet.0")); //$NON-NLS-1$
+ log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.0"), e);
resp.setHeader(WSDL_ERROR, WSDL_ERROR);
resp.getOutputStream().println(e.getMessage());
}
@@ -302,7 +286,7 @@
rs = statement.getResultSet();
}else {
String message = SOAPPlugin.Util.getString("MMGetVDBResourceServlet.12"); //$NON-NLS-1$
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, message);
+ log.error(message);
resp.getOutputStream().println(message);
return;
}
@@ -311,7 +295,7 @@
clob = rs.getClob(1);
}else {
String message = SOAPPlugin.Util.getString("MMGetVDBResourceServlet.14"); //$NON-NLS-1$
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, message);
+ log.error(message);
resp.getOutputStream().println(message);
return;
}
@@ -426,9 +410,7 @@
// make sure to encode the parameter values so they do not violate URL protocols.
parameterValue = URLEncoder.encode(((String[])parameterMap.get(keyString))[0], "UTF-8"); //$NON-NLS-1$
} catch (UnsupportedEncodingException err) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR,
- err,
- SOAPPlugin.Util.getString("MMGetVDBResourceServlet.15")); //$NON-NLS-1$
+ log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.15", err));
}
}
suffixString = suffixString + keyString + "=" + parameterValue; //$NON-NLS-1$
Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetWSDLServlet.java
===================================================================
--- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetWSDLServlet.java 2009-03-19 21:23:14 UTC (rev 603)
+++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetWSDLServlet.java 2009-03-19 21:23:41 UTC (rev 604)
@@ -31,6 +31,8 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
import com.metamatrix.common.util.WSDLServletUtil;
import com.metamatrix.core.log.FileLogWriter;
@@ -51,7 +53,8 @@
/** MM Server host/port/protocol */
private String mmServer = StringUtil.Constants.EMPTY_STRING;
- private String mmProtocol = StringUtil.Constants.EMPTY_STRING;
+ private String mmProtocol = StringUtil.Constants.EMPTY_STRING;
+ static Logger log = Logger.getLogger(MMGetVDBResourceServlet.class);
public MMGetWSDLServlet() {
}
@@ -59,11 +62,6 @@
synchronized public void init(ServletConfig config) throws ServletException {
super.init(config);
- String logFile = getServletContext().getInitParameter("logfile"); //$NON-NLS-1$
- File log = new File(logFile);
- logWriter = new FileLogWriter(log);
- platformLog.getPlatformLog().addListener(logWriter);
-
mmServer = getServletContext().getInitParameter("mmServer"); //$NON-NLS-1$
mmProtocol = getServletContext().getInitParameter("mmProtocol"); //$NON-NLS-1$
}
@@ -117,8 +115,7 @@
} catch (Exception e) {
String message = SOAPPlugin.Util
.getString(ErrorMessageKeys.SERVICE_0006); // ;
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(
- MessageLevel.ERROR, e, message);
+ log.error(message, e);
resp.getOutputStream().println(message);
return;
}
@@ -169,22 +166,16 @@
} catch (SQLException se) {
resp.getOutputStream().println(se.getMessage());
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(
- MessageLevel.ERROR, se,
- SOAPPlugin.Util.getString("MMGetVDBResourceServlet.7")); //$NON-NLS-1$
+ log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.7"), se);
} catch (Exception e) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(
- MessageLevel.ERROR, e,
- SOAPPlugin.Util.getString("MMGetVDBResourceServlet.8")); //$NON-NLS-1$
+ log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.8"), e);
resp.getOutputStream().println(e.getMessage());
} finally {
try {
// Cleanup our connection
connection.close();
} catch (SQLException e) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(
- MessageLevel.ERROR, e,
- SOAPPlugin.Util.getString("MMGetVDBResourceServlet.0")); //$NON-NLS-1$
+ log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.0"), e);
resp.setHeader(WSDL_ERROR, WSDL_ERROR);
resp.getOutputStream().println(e.getMessage());
}
Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/WSDLURLGenerator.java
===================================================================
--- trunk/soap/src/main/java/com/metamatrix/soap/servlet/WSDLURLGenerator.java 2009-03-19 21:23:14 UTC (rev 603)
+++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/WSDLURLGenerator.java 2009-03-19 21:23:41 UTC (rev 604)
@@ -40,6 +40,8 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
import com.metamatrix.common.util.WSDLServletUtil;
import com.metamatrix.core.log.FileLogWriter;
@@ -54,21 +56,12 @@
*
* @since 4.2
*/
-public class WSDLURLGenerator extends HttpServlet {
+public class WSDLURLGenerator extends HttpServlet {
+
+ static Logger log = Logger.getLogger(WSDLURLGenerator.class);
- public LogListener newListener = null;
- public FileLogWriter logWriter = null;
-
- MMGetVDBResourcePlatformLog platformLog = MMGetVDBResourcePlatformLog.getInstance();
-
synchronized public void init(ServletConfig config) throws ServletException {
super.init(config);
-
- String logFile = getServletContext().getInitParameter("logfile"); //$NON-NLS-1$
-
- File log = new File(logFile);
- logWriter = new FileLogWriter(log);
- platformLog.getPlatformLog().addListener(logWriter);
}
public void doGet(HttpServletRequest req,
@@ -102,7 +95,7 @@
checkFormValue(targetHost, WSDLServletUtil.TARGET_HOST_KEY);
} catch (Exception e) {
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, e, e.getMessage());
+ log.error(e);
resp.getOutputStream().println(e.getMessage());
return;
}
@@ -142,7 +135,7 @@
}
} catch (MalformedURLException mue) {
String message = SOAPPlugin.Util.getString(ErrorMessageKeys.SERVICE_0021, mmServerHost);
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, mue, message);
+ log.error(message, mue);
resp.getOutputStream().println(message);
return;
}
@@ -182,7 +175,7 @@
error.append((char)c);
}
String message = SOAPPlugin.Util.getString(ErrorMessageKeys.SERVICE_0022, servletPath, error.toString());
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, message);
+ log.error(message);
resp.getOutputStream().println(message);
} finally {
reader.close();
@@ -208,7 +201,7 @@
}
} catch (NumberFormatException nfe) {
String message = SOAPPlugin.Util.getString(error_key, integer);
- MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, nfe, message);
+ log.error(message, nfe);
resp.getOutputStream().println(message);
return false;
}
15 years, 2 months
teiid SVN: r602 - trunk/soap/src/main/webapp/WEB-INF/conf.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-03-19 17:22:46 -0400 (Thu, 19 Mar 2009)
New Revision: 602
Modified:
trunk/soap/src/main/webapp/WEB-INF/conf/axis2.xml
Log:
TEIID-422 - Changed context from MetaMatrix to Teiid.
Modified: trunk/soap/src/main/webapp/WEB-INF/conf/axis2.xml
===================================================================
--- trunk/soap/src/main/webapp/WEB-INF/conf/axis2.xml 2009-03-19 21:22:07 UTC (rev 601)
+++ trunk/soap/src/main/webapp/WEB-INF/conf/axis2.xml 2009-03-19 21:22:46 UTC (rev 602)
@@ -62,7 +62,7 @@
<!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
<!--root which can configured using the following contextRoot parameter-->
- <!--<parameter name="contextRoot">metamatrix-soap</parameter>-->
+ <!--<parameter name="contextRoot">teiid-soap</parameter>-->
<!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguiush those endpoints-->
<!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
15 years, 2 months
teiid SVN: r601 - in trunk/soap/src/main: webapp/WEB-INF and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-03-19 17:22:07 -0400 (Thu, 19 Mar 2009)
New Revision: 601
Removed:
trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceLog.java
trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourcePlatformLog.java
Modified:
trunk/soap/src/main/webapp/WEB-INF/classes/log4j.properties
trunk/soap/src/main/webapp/WEB-INF/web.xml
Log:
TEIID-422 - Updated logging to log4j and changed file location for JBossAS.
Deleted: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceLog.java
===================================================================
--- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceLog.java 2009-03-19 21:18:23 UTC (rev 600)
+++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceLog.java 2009-03-19 21:22:07 UTC (rev 601)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.soap.servlet;
-
-import com.metamatrix.internal.core.log.PlatformLog;
-
-/**
- * MMSoapLog
- */
-public class MMGetVDBResourceLog extends PlatformLog
-{
- /**
- * Constructor
- */
- public MMGetVDBResourceLog()
- {
- super();
- }
-}
Deleted: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourcePlatformLog.java
===================================================================
--- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourcePlatformLog.java 2009-03-19 21:18:23 UTC (rev 600)
+++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourcePlatformLog.java 2009-03-19 21:22:07 UTC (rev 601)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
- */
-
-package com.metamatrix.soap.servlet;
-
-import com.metamatrix.core.log.Logger;
-import com.metamatrix.internal.core.log.*;
-import com.metamatrix.soap.SOAPPlugin;
-import com.metamatrix.soap.log.MMSOAPLog;
-
-/**
- * Logger class (Singleton). It is initialized in the main servlet
- * of the application. The Logger file name is loaded from
- * the web.xml file in ModuleServlet.
- */
-public class MMGetVDBResourcePlatformLog
-{
-
- // =========================================================================
- // Static Members
- // =========================================================================
- private static final MMGetVDBResourcePlatformLog INSTANCE = new MMGetVDBResourcePlatformLog();
- PlatformLog platformLog = new PlatformLog("MetaMatrix SOAP log"); //$NON-NLS-1$
-
- Logger logFile = new MMSOAPLog(SOAPPlugin.PLUGIN_ID,platformLog);
-
- /**
- * Private constructor
- */
- private MMGetVDBResourcePlatformLog()
- {
- }
-
- /**
- * Get an instance of this class.
- */
- public static MMGetVDBResourcePlatformLog getInstance() {
- return INSTANCE;
- }
-
- /**
- * Get the platform log.
- * @return PlatformLog
- */
- public PlatformLog getPlatformLog()
- {
- return platformLog;
- }
-
- /**
- * Set the platform log.
- * @param log PlatformLog
- */
- public void setPlatformLog(PlatformLog log)
- {
- platformLog = log;
- }
-
- /**
- * Get the Logger.
- * @return Logger
- */
- public Logger getLogFile()
- {
- return logFile;
- }
-
- /**
- * Set the Logger.
- * @param logger
- */
- public void setLogFile(Logger logger)
- {
- logFile = logger;
- }
-}
-
-
Modified: trunk/soap/src/main/webapp/WEB-INF/classes/log4j.properties
===================================================================
--- trunk/soap/src/main/webapp/WEB-INF/classes/log4j.properties 2009-03-19 21:18:23 UTC (rev 600)
+++ trunk/soap/src/main/webapp/WEB-INF/classes/log4j.properties 2009-03-19 21:22:07 UTC (rev 601)
@@ -21,7 +21,7 @@
# LOGFILE is set to be a File appender using a PatternLayout.
log4j.appender.LOGFILE=org.apache.log4j.FileAppender
-log4j.appender.LOGFILE.File=../../log/MetaMatrixWebServices.log
+log4j.appender.LOGFILE.File=../log/JBEDSPWebServices.log
log4j.appender.LOGFILE.Append=true
log4j.appender.LOGFILE.Threshold=INFO
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
Modified: trunk/soap/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/soap/src/main/webapp/WEB-INF/web.xml 2009-03-19 21:18:23 UTC (rev 600)
+++ trunk/soap/src/main/webapp/WEB-INF/web.xml 2009-03-19 21:22:07 UTC (rev 601)
@@ -24,11 +24,6 @@
-->
<web-app>
- <context-param>
- <param-name>logfile</param-name>
- <param-value>../../log/MetaMatrixWebServices.log</param-value>
- </context-param>
-
<!-- The optional BasicAuthInterceptor filter is for use with HTTP Basic authentication. It allows circumvention
of preemptive authentication which may not always be desired. Comment/uncomment the filter
and it's mapping accordingly to achieve the preferred behavior. -->
@@ -62,7 +57,7 @@
<!--
* mmServer and mmProtocol parameters are used to obtain the WSDL from Web Service VDBs.
- * They should be set accordingly to your environment.
+ * They should be set accordingly for your environment.
*
* mmServer is the target Metamatrix host and port. For a clustered environment, comma delimit server/port combinations
* mmProtocol should be set to "mms" if the target MetaMatrix server or cluster has SSL enabled.
15 years, 2 months
teiid SVN: r600 - trunk/soap.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-03-19 17:18:23 -0400 (Thu, 19 Mar 2009)
New Revision: 600
Modified:
trunk/soap/pom.xml
Log:
TEIID-422 - Added dependency to teiid-common-internal.jar. Required for authentication exception handling.
Modified: trunk/soap/pom.xml
===================================================================
--- trunk/soap/pom.xml 2009-03-19 21:15:54 UTC (rev 599)
+++ trunk/soap/pom.xml 2009-03-19 21:18:23 UTC (rev 600)
@@ -21,6 +21,12 @@
<dependency>
<groupId>org.jboss.teiid</groupId>
+ <artifactId>teiid-common-internal</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.teiid</groupId>
<artifactId>teiid-client-jdbc</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -258,6 +264,7 @@
</exclusion>
</exclusions>
</dependency>
+
</dependencies>
15 years, 2 months
teiid SVN: r599 - trunk/engine/src/main/java/com/metamatrix/dqp/service.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-03-19 17:15:54 -0400 (Thu, 19 Mar 2009)
New Revision: 599
Modified:
trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java
Log:
TEIID-422 - Updated anonymous username
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java 2009-03-19 21:12:59 UTC (rev 598)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java 2009-03-19 21:15:54 UTC (rev 599)
@@ -45,7 +45,7 @@
public static final int CONTEXT_DELETE = 3;
public static final int CONTEXT_PROCEDURE = 4;
- public static final String DEFAULT_WSDL_USERNAME = "metamatrixwsdluser";
+ public static final String DEFAULT_WSDL_USERNAME = CoreCon
/**
* Determine which of a set of resources a connection does not have permission to
15 years, 2 months
teiid SVN: r598 - trunk/soap/src/main/java/com/metamatrix/soap/util.
by teiid-commits＠lists.jboss.org
Author: tejones
Date: 2009-03-19 17:12:59 -0400 (Thu, 19 Mar 2009)
New Revision: 598
Modified:
trunk/soap/src/main/java/com/metamatrix/soap/util/WebServiceUtil.java
Log:
TEIID-422 - Updated anonymous username
Modified: trunk/soap/src/main/java/com/metamatrix/soap/util/WebServiceUtil.java
===================================================================
--- trunk/soap/src/main/java/com/metamatrix/soap/util/WebServiceUtil.java 2009-03-19 21:11:35 UTC (rev 597)
+++ trunk/soap/src/main/java/com/metamatrix/soap/util/WebServiceUtil.java 2009-03-19 21:12:59 UTC (rev 598)
@@ -41,6 +41,7 @@
import com.metamatrix.admin.api.objects.VDB;
import com.metamatrix.api.exception.security.LogonException;
import com.metamatrix.common.comm.platform.client.ServerAdminFactory;
+import com.metamatrix.core.CoreConstants;
import com.metamatrix.core.util.StringUtil;
import com.metamatrix.soap.SOAPPlugin;
import com.metamatrix.soap.exceptions.SOAPProcessingException;
@@ -59,7 +60,7 @@
* to assure that the getUpdatedVDBResources is the only procedure used by this account. The password
* is not checked so it's value is not important, it just can't be blank.
*/
- public static final String WSDLUSER = "MetaMatrixWSDLUser"; //$NON-NLS-1$
+ public static final String WSDLUSER = CoreConstants.DEFAULT_ANON_USERNAME;
public static final String WSDLPASSWORD = "mmx"; //$NON-NLS-1$
/**
15 years, 2 months