Changeset 1506


Ignore:
Timestamp:
04/26/13 10:22:12 (6 years ago)
Author:
philsmart
Message:

general fixes and added debug output

Location:
raptor-web/trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • raptor-web/trunk/pom.xml

    r1491 r1506  
    132132        <spring.security.version>3.0.5.RELEASE</spring.security.version> 
    133133        <richfaces.version>3.3.3.Final</richfaces.version> 
    134         <jetty.version>6.1.25</jetty.version> 
     134        <jetty.version>8.1.10.v20130312</jetty.version> 
    135135    </properties> 
    136136 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/util/MessageGenerator.java

    r1503 r1506  
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     3 * 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
     9 * 
     10 * Unless required by applicable law or agreed to in writing, software 
     11 * distributed under the License is distributed on an "AS IS" BASIS, 
     12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     13 * See the License for the specific language governing permissions and 
     14 * limitations under the License. 
     15 */ 
    116 
    217package uk.ac.cardiff.raptorweb.engine.util; 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/model/SetupModel.java

    r1311 r1506  
    1717 * 
    1818 */ 
     19 
    1920package uk.ac.cardiff.raptorweb.model; 
    2021 
     
    5657 
    5758    public void setSelectEndpointCapabilities(Capabilities selectEndpointCapabilities) { 
    58         log.debug("Setting event types {}", selectEndpointCapabilities.getEventsPerType()); 
    5959        this.selectEndpointCapabilities = selectEndpointCapabilities; 
    6060    } 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/model/wizard/GraphSet.java

    r1491 r1506  
    1 /* 
    2  * Licensed to the University Corporation for Advanced Internet Development,  
    3  * Inc. (UCAID) under one or more contributor license agreements.  See the  
    4  * NOTICE file distributed with this work for additional information regarding 
    5  * copyright ownership. The UCAID licenses this file to You under the Apache  
    6  * License, Version 2.0 (the "License"); you may not use this file except in  
    7  * compliance with the License.  You may obtain a copy of the License at 
    8  * 
    9  *    http://www.apache.org/licenses/LICENSE-2.0 
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     3 * 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
    109 * 
    1110 * Unless required by applicable law or agreed to in writing, software 
     
    1514 * limitations under the License. 
    1615 */ 
    17  
    1816package uk.ac.cardiff.raptorweb.model.wizard; 
    1917 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/model/wizard/GraphWizardModel.java

    r1503 r1506  
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     3 * 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
     9 * 
     10 * Unless required by applicable law or agreed to in writing, software 
     11 * distributed under the License is distributed on an "AS IS" BASIS, 
     12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     13 * See the License for the specific language governing permissions and 
     14 * limitations under the License. 
     15 */ 
    116 
    217package uk.ac.cardiff.raptorweb.model.wizard; 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/model/wizard/GraphWizardReports.java

    r1500 r1506  
    1 /* 
    2  * Licensed to the University Corporation for Advanced Internet Development,  
    3  * Inc. (UCAID) under one or more contributor license agreements.  See the  
    4  * NOTICE file distributed with this work for additional information regarding 
    5  * copyright ownership. The UCAID licenses this file to You under the Apache  
    6  * License, Version 2.0 (the "License"); you may not use this file except in  
    7  * compliance with the License.  You may obtain a copy of the License at 
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
    83 * 
    9  *    http://www.apache.org/licenses/LICENSE-2.0 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
    109 * 
    1110 * Unless required by applicable law or agreed to in writing, software 
     
    1514 * limitations under the License. 
    1615 */ 
    17  
    1816package uk.ac.cardiff.raptorweb.model.wizard; 
    1917 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/model/wizard/SavedGraphWizardModel.java

    r1500 r1506  
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     3 * 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
     9 * 
     10 * Unless required by applicable law or agreed to in writing, software 
     11 * distributed under the License is distributed on an "AS IS" BASIS, 
     12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     13 * See the License for the specific language governing permissions and 
     14 * limitations under the License. 
     15 */ 
    116 
    217package uk.ac.cardiff.raptorweb.model.wizard; 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/sei/ServiceEndpointClient.java

    r1491 r1506  
    107107            log.debug("Accessing the MUA version " + client.getVersion()); 
    108108            capabilities = client.getCapabilities(); 
    109             log.debug("Retrieved capabilities from the MUA [{}]", endpoint); 
     109            log.debug("Retrieved capabilities [{}] from the MUA [{}]", (capabilities != null), endpoint); 
    110110        } catch (SoapFault e) { 
    111111            log.error("SOAP Fault, Problem trying to retrieving capabilities from MUA [{}]", new Object[] {endpoint}, e); 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/GraphWizardService.java

    r1493 r1506  
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     3 * 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
     9 * 
     10 * Unless required by applicable law or agreed to in writing, software 
     11 * distributed under the License is distributed on an "AS IS" BASIS, 
     12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     13 * See the License for the specific language governing permissions and 
     14 * limitations under the License. 
     15 */ 
    116 
    217package uk.ac.cardiff.raptorweb.service; 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/JuspService.java

    r1483 r1506  
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     3 * 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
     9 * 
     10 * Unless required by applicable law or agreed to in writing, software 
     11 * distributed under the License is distributed on an "AS IS" BASIS, 
     12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     13 * See the License for the specific language governing permissions and 
     14 * limitations under the License. 
     15 */ 
    116package uk.ac.cardiff.raptorweb.service; 
    217 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/impl/EventTypeServiceImpl.java

    r1491 r1506  
    5353        List<SelectItem> eventTypes = new ArrayList<SelectItem>(); 
    5454 
    55         List<EventTypeInformation> eventTypesFromAttached = webEngine.getAttachedCapabilities().getEventsPerType(); 
    56         if (eventTypesFromAttached != null) { 
    57             for (EventTypeInformation eventType : eventTypesFromAttached) { 
    58                 String eventTypeString = eventType.getEventTypeName(); 
    59                 SelectItem item = new SelectItem(); 
     55        if (webEngine.getAttachedCapabilities() != null) { 
     56            List<EventTypeInformation> eventTypesFromAttached = webEngine.getAttachedCapabilities().getEventsPerType(); 
     57            if (eventTypesFromAttached != null) { 
     58                for (EventTypeInformation eventType : eventTypesFromAttached) { 
     59                    String eventTypeString = eventType.getEventTypeName(); 
     60                    SelectItem item = new SelectItem(); 
    6061 
    61                 String labelValue = eventTypeToDisplayMapper.mapEventType(eventTypeString); 
     62                    String labelValue = eventTypeToDisplayMapper.mapEventType(eventTypeString); 
    6263 
    63                 if (labelValue != null) { 
    64                     item.setLabel(labelValue); 
    65                     item.setValue(eventTypeString); 
    66                     log.debug("Setting event value to: " + item.getValue()); 
    67                     eventTypes.add(item); 
     64                    if (labelValue != null) { 
     65                        item.setLabel(labelValue); 
     66                        item.setValue(eventTypeString); 
     67                        log.debug("Setting event value to: " + item.getValue()); 
     68                        eventTypes.add(item); 
     69                    } 
     70 
    6871                } 
    69  
    7072            } 
    7173        } 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/impl/GraphWizardServiceImpl.java

    r1503 r1506  
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     3 * 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
     9 * 
     10 * Unless required by applicable law or agreed to in writing, software 
     11 * distributed under the License is distributed on an "AS IS" BASIS, 
     12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     13 * See the License for the specific language governing permissions and 
     14 * limitations under the License. 
     15 */ 
    116 
    217package uk.ac.cardiff.raptorweb.service.impl; 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/impl/JuspServiceImpl.java

    r1483 r1506  
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     3 * 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
     9 * 
     10 * Unless required by applicable law or agreed to in writing, software 
     11 * distributed under the License is distributed on an "AS IS" BASIS, 
     12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     13 * See the License for the specific language governing permissions and 
     14 * limitations under the License. 
     15 */ 
    116package uk.ac.cardiff.raptorweb.service.impl; 
    217 
  • raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/impl/SavedWizardReportsServiceImpl.java

    r1503 r1506  
     1/** 
     2 * Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     3 * 
     4 * Licensed under the Apache License, Version 2.0 (the "License"); 
     5 * you may not use this file except in compliance with the License. 
     6 * You may obtain a copy of the License at 
     7 * 
     8 *         http://www.apache.org/licenses/LICENSE-2.0 
     9 * 
     10 * Unless required by applicable law or agreed to in writing, software 
     11 * distributed under the License is distributed on an "AS IS" BASIS, 
     12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     13 * See the License for the specific language governing permissions and 
     14 * limitations under the License. 
     15 */ 
    116 
    217package uk.ac.cardiff.raptorweb.service.impl; 
  • raptor-web/trunk/src/main/resources/graph-wizard-mapping.xml

    r1500 r1506  
    11<?xml version="1.0" encoding="UTF-8"?> 
     2<!-- 
     3 
     4    Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     5 
     6    Licensed under the Apache License, Version 2.0 (the "License"); 
     7    you may not use this file except in compliance with the License. 
     8    You may obtain a copy of the License at 
     9 
     10            http://www.apache.org/licenses/LICENSE-2.0 
     11 
     12    Unless required by applicable law or agreed to in writing, software 
     13    distributed under the License is distributed on an "AS IS" BASIS, 
     14    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     15    See the License for the specific language governing permissions and 
     16    limitations under the License. 
     17 
     18--> 
    219 
    320<mapping> 
  • raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/graph-wizard-subflow.xml

    r1503 r1506  
     1<!-- 
     2 
     3    Copyright (C) 2010 Cardiff University, Wales <smartp@cf.ac.uk> 
     4 
     5    Licensed under the Apache License, Version 2.0 (the "License"); 
     6    you may not use this file except in compliance with the License. 
     7    You may obtain a copy of the License at 
     8 
     9            http://www.apache.org/licenses/LICENSE-2.0 
     10 
     11    Unless required by applicable law or agreed to in writing, software 
     12    distributed under the License is distributed on an "AS IS" BASIS, 
     13    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
     14    See the License for the specific language governing permissions and 
     15    limitations under the License. 
     16 
     17--> 
    118<flow parent="reports" start-state="editRunDecision" xmlns="http://www.springframework.org/schema/webflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    219    xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd"> 
  • raptor-web/trunk/src/main/webapp/WEB-INF/web.xml

    r1491 r1506  
    4545        <param-value>server</param-value> 
    4646    </context-param> 
     47     
     48    <!--  so that Jetty picks up the correct faces config --> 
     49    <listener> 
     50        <listener-class> 
     51            com.sun.faces.config.ConfigureListener 
     52        </listener-class> 
     53    </listener> 
    4754 
    4855 
Note: See TracChangeset for help on using the changeset viewer.