Skip to content

Commit

Permalink
Fixed rendering of class content
Browse files Browse the repository at this point in the history
Updated headers on Test namespace
Updated the wizard to be more forgiving if the compact and full versions of the framework are installed in the same directory

git-svn-id: https://fisheye.marc-hi.ca/svn/everest/branches/1.2@314 0a814079-c22b-1640-8a39-4bdcdc761e1f
  • Loading branch information
Justin Fyfe committed Mar 3, 2014
1 parent c5e8a71 commit 7b28685
Show file tree
Hide file tree
Showing 228 changed files with 4,247 additions and 192 deletions.
67 changes: 67 additions & 0 deletions EverestApache.licenseheader
@@ -0,0 +1,67 @@
extensions: designer.cs generated.cs
extensions: .cs .cpp .h
/**
* Copyright 2008-%CurrentYear% Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: %UserName%
* Date: %CreationDay%-%CreationMonth%-%CreationYear%
*/
extensions: .sql
--
-- Copyright %CreationYear%-%CurrentYear% Mohawk College of Applied Arts and Technology
--
-- Licensed under the Apache License, Version 2.0 (the "License"); you
-- may not use this file except in compliance with the License. You may
-- obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-- License for the specific language governing permissions and limitations under
-- the License.
--
-- User: %UserName%
-- Date: %CreationDay%-%CreationMonth%-%CreationYear%
--
extensions: .aspx .ascx
<%--
Sample license text.
--%>
extensions: .vb
'Sample license text.
extensions: .xml .config .xsd
<!--

Copyright %CreationYear%-%CurrentYear% Mohawk College of Applied Arts and Technology

Licensed under the Apache License, Version 2.0 (the "License"); you
may not use this file except in compliance with the License. You may
obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.

User: %UserName%
Date: %CreationDay%-%CreationMonth%-%CreationYear%


-->
7 changes: 7 additions & 0 deletions MARC.Everest.Connectors.WCF/Core/ConnectorServiceClient.cs
Expand Up @@ -23,6 +23,7 @@
using System.ServiceModel;
using System.ServiceModel.Channels;
using System.Threading;
using System.Diagnostics;

namespace MARC.Everest.Connectors.WCF.Core
{
Expand Down Expand Up @@ -209,7 +210,13 @@ private object[] OnEndProcessMessage(System.IAsyncResult result)
/// <returns>The resulting message.</returns>
public System.ServiceModel.Channels.Message ProcessInboundMessage(System.ServiceModel.Channels.Message m)
{
#if DEBUG
Trace.WriteLine("Processing inbound channel message");
#endif
return base.Channel.ProcessInboundMessage(m);
#if DEBUG
Trace.WriteLine("Done Processing inbound channel message");
#endif
}

#endregion
Expand Down
35 changes: 33 additions & 2 deletions MARC.Everest.Connectors.WCF/WcfClientConnector.cs
Expand Up @@ -795,12 +795,18 @@ public void Open()
throw new ConnectorException(ConnectorException.MSG_NULL_FORMATTER, ConnectorException.ReasonType.NullFormatter);

Dictionary<string, List<string>> parameters = ConnectionStringParser.ParseConnectionString(ConnectionString);
string endpointName = null, endpointAddress = null;
string endpointName = null, endpointAddress = null, bindingClass = null, bindingConfiguration = null;

// Parameters
foreach (KeyValuePair<string, List<string>> parm in parameters)
switch (parm.Key)
{
case "binding":
bindingClass = parm.Value[0];
break;
case "bindingConfiguration":
bindingConfiguration = parm.Value[0];
break;
case "endpointname":
endpointName = parm.Value[0];
break;
Expand All @@ -809,8 +815,33 @@ public void Open()
break;
}

if (bindingClass != null)
{
Binding binding = null;
switch (bindingClass)
{
case "wsHttpBinding":
if (!String.IsNullOrEmpty(bindingConfiguration))
binding = new WSHttpBinding(bindingConfiguration);
else
binding = new WSHttpBinding(SecurityMode.None, false);
break;
case "basicHttpBinding":
if (!String.IsNullOrEmpty(bindingConfiguration))
binding = new BasicHttpBinding(bindingConfiguration);
else
binding = new BasicHttpBinding();
break;
default:
throw new InvalidOperationException("Could not understand binding");
}
if (endpointAddress == null)
throw new InvalidOperationException("When manually specifying binding you must specify an endpointAddress");
else
wcfClient = new ConnectorServiceClient(binding, new EndpointAddress(endpointAddress));
}
// Create the client
if (endpointName == null)
else if (endpointName == null)
throw new InvalidOperationException("The connection string must include the 'endpointName' attribute!");
else if (endpointAddress == null)
wcfClient = new ConnectorServiceClient(endpointName);
Expand Down
2 changes: 1 addition & 1 deletion MARC.Everest.Formatters.XML.ITS1/XmlIts1Formatter.cs
Expand Up @@ -1147,7 +1147,7 @@ public virtual IGraphable ParseObject(XmlReader r, Type useType, Type interactio

if (xsiType != null)
{
if (typeof(ANY).IsAssignableFrom(useType)) // HACK: We don't override the use type for ANY derivatives as some types are special and require special typing
if (useType.IsInterface || typeof(ANY).IsAssignableFrom(useType)) // HACK: We don't override the use type for ANY derivatives as some types are special and require special typing
ixsf = this.GetAdjustedFormatter(xsiType); //Util.ParseXSITypeName(r.GetAttribute("type", NS_XSI));
else
useType = this.ParseXSITypeName(xsiType, r as IXmlNamespaceResolver);
Expand Down
22 changes: 22 additions & 0 deletions MARC.Everest.Test/App.config
@@ -1,4 +1,26 @@
<?xml version="1.0"?>

<!--
Copyright 2013-2014 Mohawk College of Applied Arts and Technology
Licensed under the Apache License, Version 2.0 (the "License"); you
may not use this file except in compliance with the License. You may
obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.
User: fyfej
Date: 3-6-2013
-->
<configuration>
<!--<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Expand Down
20 changes: 19 additions & 1 deletion MARC.Everest.Test/DataTypes/ADTest.cs
@@ -1,4 +1,22 @@
using System;
/**
* Copyright 2008-2014 Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: fyfej
* Date: 3-6-2013
*/
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
Expand Down
20 changes: 19 additions & 1 deletion MARC.Everest.Test/DataTypes/ADXPTest.cs
@@ -1,4 +1,22 @@
using System;
/**
* Copyright 2008-2014 Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: fyfej
* Date: 3-6-2013
*/
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
Expand Down
20 changes: 19 additions & 1 deletion MARC.Everest.Test/DataTypes/BAGTest.cs
@@ -1,4 +1,22 @@
using System;
/**
* Copyright 2008-2014 Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: fyfej
* Date: 3-6-2013
*/
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
Expand Down
20 changes: 19 additions & 1 deletion MARC.Everest.Test/DataTypes/BLTest.cs
@@ -1,4 +1,22 @@
using System;
/**
* Copyright 2008-2014 Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: fyfej
* Date: 3-6-2013
*/
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
Expand Down
20 changes: 19 additions & 1 deletion MARC.Everest.Test/DataTypes/CDTest.cs
@@ -1,4 +1,22 @@
using System;
/**
* Copyright 2008-2014 Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: fyfej
* Date: 3-6-2013
*/
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
Expand Down
20 changes: 19 additions & 1 deletion MARC.Everest.Test/DataTypes/CETest.cs
@@ -1,4 +1,22 @@
using System;
/**
* Copyright 2008-2014 Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: fyfej
* Date: 3-6-2013
*/
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
Expand Down
20 changes: 19 additions & 1 deletion MARC.Everest.Test/DataTypes/COTest.cs
@@ -1,4 +1,22 @@
using System;
/**
* Copyright 2008-2014 Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: fyfej
* Date: 3-6-2013
*/
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
Expand Down
20 changes: 19 additions & 1 deletion MARC.Everest.Test/DataTypes/CRTest.cs
@@ -1,4 +1,22 @@
using System;
/**
* Copyright 2008-2014 Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: fyfej
* Date: 3-6-2013
*/
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
Expand Down
20 changes: 19 additions & 1 deletion MARC.Everest.Test/DataTypes/CSTest.cs
@@ -1,4 +1,22 @@
using System;
/**
* Copyright 2008-2014 Mohawk College of Applied Arts and Technology
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You may
* obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* User: fyfej
* Date: 3-6-2013
*/
using System;
using System.Text;
using System.Collections.Generic;
using System.Linq;
Expand Down

0 comments on commit 7b28685

Please sign in to comment.